diff --git a/pytest_fixtures/component/http_proxy.py b/pytest_fixtures/component/http_proxy.py
index 0fce475f83..c81137d767 100644
--- a/pytest_fixtures/component/http_proxy.py
+++ b/pytest_fixtures/component/http_proxy.py
@@ -13,16 +13,20 @@ def session_auth_proxy(session_target_sat):
 @pytest.fixture
 def setup_http_proxy(request, module_manifest_org, target_sat):
     """Create a new HTTP proxy and set related settings based on proxy"""
-    content_proxy_value = target_sat.api.Setting().search(
-        query={'search': 'name=content_default_http_proxy'}
-    )[0]
-    general_proxy_value = target_sat.api.Setting().search(query={'search': 'name=http_proxy'})[0]
+    content_proxy_value = (
+        target_sat.api.Setting()
+        .search(query={'search': 'name=content_default_http_proxy'})[0]
+        .value
+    )
+    general_proxy_value = (
+        target_sat.api.Setting().search(query={'search': 'name=http_proxy'})[0].value
+    )
 
     http_proxy = target_sat.api_factory.make_http_proxy(module_manifest_org, request.param)
     content_proxy = target_sat.api.Setting().search(
         query={'search': 'name=content_default_http_proxy'}
     )[0]
-    assert content_proxy.value == http_proxy.name
+    assert content_proxy.value == (http_proxy.name if request.param is not None else '')
 
     if request.param is not None:
         general_proxy = (
diff --git a/robottelo/host_helpers/api_factory.py b/robottelo/host_helpers/api_factory.py
index de6c05f8ce..16659adab7 100644
--- a/robottelo/host_helpers/api_factory.py
+++ b/robottelo/host_helpers/api_factory.py
@@ -39,7 +39,7 @@ def make_http_proxy(self, org, http_proxy_type):
                 name=gen_string('alpha', 15),
                 url=settings.http_proxy.un_auth_proxy_url,
                 organization=[org.id],
-                default_content_http_proxy=True,
+                content_default_http_proxy=True,
             ).create()
         if http_proxy_type:
             return self._satellite.api.HTTPProxy(
@@ -48,7 +48,7 @@ def make_http_proxy(self, org, http_proxy_type):
                 username=settings.http_proxy.username,
                 password=settings.http_proxy.password,
                 organization=[org.id],
-                default_content_http_proxy=True,
+                content_default_http_proxy=True,
             ).create()
         return None
 
diff --git a/tests/foreman/ui/test_http_proxy.py b/tests/foreman/ui/test_http_proxy.py
index 4bb9bc836b..e0e83cb521 100644
--- a/tests/foreman/ui/test_http_proxy.py
+++ b/tests/foreman/ui/test_http_proxy.py
@@ -277,16 +277,24 @@ def test_positive_set_default_http_proxy(
             {
                 'http_proxy.name': http_proxy_name,
                 'http_proxy.url': http_proxy_url,
-                'http_proxy.default_content_http_proxy': 'true',
+                'http_proxy.content_default_http_proxy': 'true',
                 'locations.resources.assigned': [module_location.name],
                 'organizations.resources.assigned': [module_org.name],
             }
         )
-        request.addfinalizer(
-            lambda: target_sat.api.HTTPProxy()
-            .search(query={'search': f'name={http_proxy_name}'})[0]
-            .delete()
-        )
+
+        # Teardown
+        @request.addfinalizer
+        def _finalize():
+            target_sat.api.HTTPProxy().search(query={'search': f'name={http_proxy_name}'})[
+                0
+            ].delete()
+            default_proxy = target_sat.api.Setting().search(
+                query={'search': 'name=content_default_http_proxy'}
+            )[0]
+            assert default_proxy.value != http_proxy_name
+            assert not default_proxy.value
+
         result = session.settings.read(f'name = {property_name}')
         assert result['table'][0]['Value'] == f'{http_proxy_name} ({http_proxy_url})'