diff --git a/tests/foreman/api/test_ansible.py b/tests/foreman/api/test_ansible.py
index 65648db1a05..829f225938d 100644
--- a/tests/foreman/api/test_ansible.py
+++ b/tests/foreman/api/test_ansible.py
@@ -326,6 +326,7 @@ class TestAnsibleREX:
     """
 
     @pytest.mark.e2e
+    @pytest.mark.pit_client
     @pytest.mark.no_containers
     @pytest.mark.rhel_ver_match('[^6].*')
     def test_positive_ansible_job_on_host(
diff --git a/tests/foreman/api/test_computeresource_azurerm.py b/tests/foreman/api/test_computeresource_azurerm.py
index d8751f65786..04be34f7e9c 100644
--- a/tests/foreman/api/test_computeresource_azurerm.py
+++ b/tests/foreman/api/test_computeresource_azurerm.py
@@ -251,6 +251,7 @@ def azureclient_host(self, azurermclient, class_host_ft):
 
     @pytest.mark.e2e
     @pytest.mark.upgrade
+    @pytest.mark.pit_server
     @pytest.mark.tier3
     @pytest.mark.parametrize('sat_azure', ['sat'], indirect=True)
     def test_positive_azurerm_host_provisioned(self, class_host_ft, azureclient_host):
diff --git a/tests/foreman/api/test_computeresource_gce.py b/tests/foreman/api/test_computeresource_gce.py
index 8f27e9b98fe..b0143451cc7 100644
--- a/tests/foreman/api/test_computeresource_gce.py
+++ b/tests/foreman/api/test_computeresource_gce.py
@@ -226,6 +226,7 @@ def google_host(self, googleclient):
 
     @pytest.mark.e2e
     @pytest.mark.tier1
+    @pytest.mark.pit_server
     @pytest.mark.build_sanity
     @pytest.mark.parametrize('sat_gce', ['sat', 'puppet_sat'], indirect=True)
     def test_positive_gce_host_provisioned(self, class_host, google_host):
diff --git a/tests/foreman/api/test_registration.py b/tests/foreman/api/test_registration.py
index 66cefa89d1d..0f95a4a95ff 100644
--- a/tests/foreman/api/test_registration.py
+++ b/tests/foreman/api/test_registration.py
@@ -28,6 +28,7 @@
 
 
 @pytest.mark.e2e
+@pytest.mark.pit_client
 @pytest.mark.rhel_ver_match('[^6]')
 @pytest.mark.no_containers
 def test_host_registration_end_to_end(
@@ -87,6 +88,7 @@ def test_host_registration_end_to_end(
 
 
 @pytest.mark.tier3
+@pytest.mark.pit_client
 @pytest.mark.rhel_ver_match('[^6]')
 def test_positive_allow_reregistration_when_dmi_uuid_changed(
     module_sca_manifest_org,
diff --git a/tests/foreman/cli/test_ansible.py b/tests/foreman/cli/test_ansible.py
index 76730ac0aa6..52fbe376ac6 100644
--- a/tests/foreman/cli/test_ansible.py
+++ b/tests/foreman/cli/test_ansible.py
@@ -435,6 +435,7 @@ def test_positive_run_serial(self, rex_contenthosts, target_sat):
     @pytest.mark.e2e
     @pytest.mark.no_containers
     @pytest.mark.pit_server
+    @pytest.mark.pit_client
     @pytest.mark.rhel_ver_match('[^6].*')
     @pytest.mark.skipif(
         (not settings.robottelo.repos_hosting_url), reason='Missing repos_hosting_url'
diff --git a/tests/foreman/cli/test_fact.py b/tests/foreman/cli/test_fact.py
index b17d4133f27..096f4368d9f 100644
--- a/tests/foreman/cli/test_fact.py
+++ b/tests/foreman/cli/test_fact.py
@@ -66,6 +66,7 @@ def test_negative_list_by_name(module_target_sat):
 
 
 @pytest.mark.no_containers
+@pytest.mark.pit_client
 @pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
 def test_positive_update_client_facts_verify_imported_values(
     module_target_sat, rhel_contenthost, module_org, module_location, module_activation_key
diff --git a/tests/foreman/destructive/test_registration.py b/tests/foreman/destructive/test_registration.py
index b6293f15547..083bbaff6bd 100644
--- a/tests/foreman/destructive/test_registration.py
+++ b/tests/foreman/destructive/test_registration.py
@@ -20,6 +20,7 @@
 
 @pytest.mark.tier3
 @pytest.mark.no_containers
+@pytest.mark.pit_client
 @pytest.mark.rhel_ver_match('[^6]')
 def test_host_registration_rex_pull_mode(
     module_org,
diff --git a/tests/foreman/ui/test_registration.py b/tests/foreman/ui/test_registration.py
index 65c79b8163c..67485930a25 100644
--- a/tests/foreman/ui/test_registration.py
+++ b/tests/foreman/ui/test_registration.py
@@ -134,6 +134,7 @@ def test_negative_global_registration_without_ak(
 
 @pytest.mark.e2e
 @pytest.mark.no_containers
+@pytest.mark.pit_client
 @pytest.mark.tier3
 @pytest.mark.rhel_ver_match('[^6]')
 def test_positive_global_registration_end_to_end(
@@ -356,7 +357,8 @@ def test_global_registration_form_populate(
 
 
 @pytest.mark.tier2
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.pit_client
+@pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
 @pytest.mark.no_containers
 def test_global_registration_with_gpg_repo_and_default_package(
     module_activation_key, rhel_contenthost, target_sat, module_org