diff --git a/pytest_fixtures/core/sat_cap_factory.py b/pytest_fixtures/core/sat_cap_factory.py
index 018bda48114..05264823a18 100644
--- a/pytest_fixtures/core/sat_cap_factory.py
+++ b/pytest_fixtures/core/sat_cap_factory.py
@@ -232,28 +232,31 @@ def get_iop_deploy_args():
 
 
 @pytest.fixture(scope='module')
-def module_satellite_iop():
+def module_satellite_iop(module_target_sat):
     """Deploy and configure Red Hat Lightspeed in Satellite
 
     Use the IoP workflow which deploys Satellite + IoP
     """
-    deploy_args = get_iop_deploy_args()
+    # deploy_args = get_iop_deploy_args()
 
-    with Broker(
-        workflow=settings.server.deploy_workflows.iop, **deploy_args, host_class=Satellite
-    ) as satellite:
-        yield satellite
+    # with Broker(
+    #     workflow=settings.server.deploy_workflows.iop, **deploy_args, host_class=Satellite
+    # ) as satellite:
+    #     satellite.execute('satellite-maintain service restart --only foreman')
+    #     yield satellite
+    return module_target_sat
 
 
 @pytest.fixture
-def satellite_iop():
+def satellite_iop(target_sat):
     """Deploy and configure Red Hat Lightspeed in Satellite"""
-    deploy_args = get_iop_deploy_args()
+    # deploy_args = get_iop_deploy_args()
 
-    with Broker(
-        workflow=settings.server.deploy_workflows.iop, **deploy_args, host_class=Satellite
-    ) as satellite:
-        yield satellite
+    # with Broker(
+    #     workflow=settings.server.deploy_workflows.iop, **deploy_args, host_class=Satellite
+    # ) as satellite:
+    #     satellite.execute('satellite-maintain service restart --only foreman')
+    return target_sat
 
 
 @pytest.fixture(scope='module')
diff --git a/tests/foreman/ui/test_rhcloud_inventory.py b/tests/foreman/ui/test_rhcloud_inventory.py
index cb1d474cc8a..63f730b6c60 100644
--- a/tests/foreman/ui/test_rhcloud_inventory.py
+++ b/tests/foreman/ui/test_rhcloud_inventory.py
@@ -205,7 +205,7 @@ def test_rhcloud_inventory_e2e(
 
 
 @pytest.mark.run_in_one_thread
-def test_rh_cloud_inventory_settings(
+def test_rhcloud_inventory_settings(
     module_target_sat,
     inventory_settings,
     rhcloud_manifest_org,
@@ -589,7 +589,7 @@ def test_subscription_connection_settings_ui_behavior(request, module_target_sat
 
 @pytest.mark.no_containers
 @pytest.mark.run_in_one_thread
-def test_rh_cloud_minimal_report(
+def test_rhcloud_minimal_report(
     module_target_sat,
     inventory_settings,
     rhcloud_manifest_org,