diff --git a/testsuite/features/reposync/reference_srv_check_reposync.feature b/testsuite/features/reposync/reference_srv_check_reposync.feature
index 3ad092a95d87..8ae0eb59b728 100644
--- a/testsuite/features/reposync/reference_srv_check_reposync.feature
+++ b/testsuite/features/reposync/reference_srv_check_reposync.feature
@@ -8,6 +8,7 @@ Feature: Reposync works as expected
   Scenario: Check reposync of Rocky Linux 8 channels being finished
     Then I wait until the channel "rockylinux-8-x86_64" has been synced with packages
     And I wait until the channel "rockylinux-8-appstream-x86_64" has been synced with packages
+
 @uyuni
   Scenario: Check reposync of Rocky Linux 8 channels being finished
     Then I wait until the channel "rockylinux8-x86_64" has been synced with packages
@@ -28,6 +29,7 @@ Feature: Reposync works as expected
     And I wait until the channel "ubuntu-2204-amd64-main-security-uyuni" has been synced with packages
 
 @scc_credentials
+@susemanager
   Scenario: Check reposync of SLES 15 SP4 channels being finished
     Then I wait until the channel "sle-module-basesystem15-sp4-updates-x86_64" has been synced with packages
     And I wait until the channel "sle-module-server-applications15-sp4-updates-x86_64" has been synced with packages
@@ -35,9 +37,19 @@ Feature: Reposync works as expected
     And I wait until the channel "sle-module-devtools15-sp4-updates-x86_64" has been synced with packages
     And I wait until the channel "sle-module-containers15-sp4-pool-x86_64" has been synced with packages
 
+@uyuni
+  Scenario: Check reposync of openSUSE Leap 15.4 channels being finished
+    Then I wait until the channel "opensuse_leap15_4" has been synced with packages
+    And I wait until the channel "opensuse_leap15_4-non-oss" has been synced with packages
+    And I wait until the channel "opensuse_leap15_4-non-oss-updates" has been synced with packages
+    And I wait until the channel "opensuse_leap15_4-updates" has been synced with packages
+    And I wait until the channel "opensuse_leap15_4-backports-updates" has been synced with packages
+    And I wait until the channel "opensuse_leap15_4-sle-updates" has been synced with packages
+    And I wait until the channel "uyuni-proxy-devel-leap" has been synced with packages
+
 @scc_credentials
 @susemanager
-  Scenario: Check reposync of SLES 15 Client Tools being finished
+  Scenario: Check reposync of Client Tools being finished
     Then I wait until the channel "sle-manager-tools15-pool-x86_64-sp4" has been synced
     And I wait until the channel "sle-manager-tools15-updates-x86_64-sp4" has been synced with packages
     And I wait until the channel "res8-manager-tools-updates-x86_64-rocky" has been synced with packages
@@ -45,7 +57,7 @@ Feature: Reposync works as expected
     And I wait until the channel "ubuntu-22.04-suse-manager-tools-amd64" has been synced with packages
 
 @uyuni
-  Scenario: Check reposync of SLES 15 Client Tools being finished
-    Then I wait until the channel "sles15-sp4-uyuni-client-x86_64" has been synced with packages
+  Scenario: Check reposync of Client Tools being finished
+    And I wait until the channel "opensuse_leap15_4-uyuni-client" has been synced with packages
     And I wait until the channel "rockylinux8-uyuni-client-x86_64" has been synced with packages
     And I wait until the channel "ubuntu-2204-amd64-uyuni-client" has been synced with packages
diff --git a/testsuite/features/reposync/reference_srv_sync_products_extra.feature b/testsuite/features/reposync/reference_srv_sync_products_extra.feature
index 85595a8f7a4f..3e18f5c7f25f 100644
--- a/testsuite/features/reposync/reference_srv_sync_products_extra.feature
+++ b/testsuite/features/reposync/reference_srv_sync_products_extra.feature
@@ -11,10 +11,14 @@ Feature: Synchronize extra products in the products page of the Setup Wizard
     Then I should see a "Arch" text
     And I should see a "Channels" text
 
-@uyuni
+@susemanager
   Scenario: Enable SLES15 SP4 Uyuni client tools for creating bootstrap repositories
     When I use spacewalk-common-channel to add channel "sle-product-sles15-sp4-pool-x86_64 sles15-sp4-uyuni-client" with arch "x86_64"
 
+@uyuni
+  Scenario: Add openSUSE Leap 15.4 product, including Uyuni Client Tools
+    When I use spacewalk-common-channel to add channel "opensuse_leap15_4 opensuse_leap15_4-non-oss opensuse_leap15_4-non-oss-updates opensuse_leap15_4-updates opensuse_leap15_4-backports-updates opensuse_leap15_4-sle-updates uyuni-proxy-devel-leap opensuse_leap15_4-uyuni-client" with arch "x86_64"
+
 @scc_credentials
 @susemanager
   Scenario: Add Rocky 8 product with recommended sub-products