diff --git a/pytest_fixtures/component/provision_pxe.py b/pytest_fixtures/component/provision_pxe.py
index afdb83fb423..e7cb73e571a 100644
--- a/pytest_fixtures/component/provision_pxe.py
+++ b/pytest_fixtures/component/provision_pxe.py
@@ -211,6 +211,10 @@ def module_provisioning_sat(
         remote_execution_proxy=[module_provisioning_capsule.id],
         domain=[domain.id],
     ).create()
+    if provisioning_type == 'discovery':
+        for host in sat.api.DiscoveredHost().search():
+            host.delete()
+
     if sat.network_type == NetworkType.IPV4:
         assert sat.execute('cat /dev/null > /var/lib/dhcpd/dhcpd.leases').status == 0
         assert sat.execute('systemctl restart dhcpd').status == 0
diff --git a/tests/foreman/api/test_discoveredhost.py b/tests/foreman/api/test_discoveredhost.py
index 8f0a681f9c1..d62ad4df461 100644
--- a/tests/foreman/api/test_discoveredhost.py
+++ b/tests/foreman/api/test_discoveredhost.py
@@ -438,10 +438,6 @@ def test_positive_reboot_all_pxe_hosts(
         )
 
         discovered_host = sat.api.DiscoveredHost().search(query={'mac': mac})[0]
-        discovered_host.hostgroup = provisioning_hostgroup
-        discovered_host.location = provisioning_hostgroup.location[0]
-        discovered_host.organization = provisioning_hostgroup.organization[0]
-        discovered_host.build = True
         result = sat.api.DiscoveredHost(id=discovered_host.id).reboot_all()
         assert 'Unable to perform reboot' not in result
 
diff --git a/tests/foreman/ui/test_discoveredhost.py b/tests/foreman/ui/test_discoveredhost.py
index 27cacbe58cb..71715cd193c 100644
--- a/tests/foreman/ui/test_discoveredhost.py
+++ b/tests/foreman/ui/test_discoveredhost.py
@@ -170,10 +170,28 @@ def test_positive_custom_provision_pxe_host(
         delay=20,
     )
     discovered_host = sat.api.DiscoveredHost().search(query={'mac': mac})[0]
-    discovered_host.hostgroup = provisioning_hostgroup
-    discovered_host.location = provisioning_hostgroup.location[0]
-    discovered_host.organization = provisioning_hostgroup.organization[0]
-    discovered_host.build = True
+    if is_open('SAT-33477') and (
+        sat.cli.DiscoveredHost.list(
+            {
+                'organization-id': module_org.id,
+                'location-id': module_location.id,
+            }
+        )
+        == []
+    ):
+        with sat.ui_session() as temp_session:
+            temp_session.organization.select(org_name='Any organization')
+            temp_session.location.select(loc_name='Any location')
+            temp_session.discoveredhosts.apply_action(
+                'Assign Organization',
+                discovered_host.name,
+                values=dict(organization=module_org.name),
+            )
+            temp_session.discoveredhosts.apply_action(
+                'Assign Location',
+                discovered_host.name,
+                values=dict(location=module_location.name),
+            )
 
     discovered_host_name = discovered_host.name
     domain_name = provisioning_hostgroup.domain.read().name
@@ -325,10 +343,28 @@ def test_positive_auto_provision_host_with_rule(
         delay=20,
     )
     discovered_host = sat.api.DiscoveredHost().search(query={'mac': mac})[0]
-    discovered_host.hostgroup = provisioning_hostgroup
-    discovered_host.location = provisioning_hostgroup.location[0]
-    discovered_host.organization = provisioning_hostgroup.organization[0]
-    discovered_host.build = True
+    if is_open('SAT-33477') and (
+        sat.cli.DiscoveredHost.list(
+            {
+                'organization-id': module_org.id,
+                'location-id': module_location.id,
+            }
+        )
+        == []
+    ):
+        with sat.ui_session() as temp_session:
+            temp_session.organization.select(org_name='Any organization')
+            temp_session.location.select(loc_name='Any location')
+            temp_session.discoveredhosts.apply_action(
+                'Assign Organization',
+                discovered_host.name,
+                values=dict(organization=module_org.name),
+            )
+            temp_session.discoveredhosts.apply_action(
+                'Assign Location',
+                discovered_host.name,
+                values=dict(location=module_location.name),
+            )
 
     discovered_host_name = discovered_host.name
     domain_name = provisioning_hostgroup.domain.read().name