diff --git a/testsuite/features/core/srv_channels_add.feature b/testsuite/features/core/srv_channels_add.feature
index 20a94fc833b6..2baa076144c8 100644
--- a/testsuite/features/core/srv_channels_add.feature
+++ b/testsuite/features/core/srv_channels_add.feature
@@ -3,7 +3,7 @@
 #
 # This feature can cause failures in:
 # - features/core/srv_create_activationkey.feature
-# - features/core/srv_create_repository.feature
+# - features/reposync/srv_create_repository.feature
 # - features/init_client/sle_minion.feature
 # - features/init_client/sle_ssh_minion.feature
 # - features/init_client/min_rhlike.feature
diff --git a/testsuite/features/core/srv_create_repository.feature b/testsuite/features/reposync/srv_create_repository.feature
similarity index 100%
rename from testsuite/features/core/srv_create_repository.feature
rename to testsuite/features/reposync/srv_create_repository.feature
diff --git a/testsuite/run_sets/core.yml b/testsuite/run_sets/core.yml
index 541c79e8dc03..0617abde816a 100644
--- a/testsuite/run_sets/core.yml
+++ b/testsuite/run_sets/core.yml
@@ -14,7 +14,6 @@
 - features/core/srv_organization_credentials.feature
 - features/core/srv_user_preferences.feature
 - features/core/srv_channels_add.feature
-- features/core/srv_create_repository.feature
 - features/core/srv_create_activationkey.feature
 - features/core/srv_osimage.feature
 - features/core/srv_docker.feature
diff --git a/testsuite/run_sets/refhost.yml b/testsuite/run_sets/refhost.yml
index cd09326b7421..02ee8f32dd25 100644
--- a/testsuite/run_sets/refhost.yml
+++ b/testsuite/run_sets/refhost.yml
@@ -12,7 +12,7 @@
 - features/core/allcli_sanity.feature
 - features/core/srv_first_settings.feature
 - features/core/srv_channels_add.feature
-- features/core/srv_create_repository.feature
+- features/reposync/srv_create_repository.feature
 - features/core/srv_create_activationkey.feature
 - features/core/srv_docker.feature
 
diff --git a/testsuite/run_sets/reposync.yml b/testsuite/run_sets/reposync.yml
index 87664f936ab5..a6423908d0c9 100644
--- a/testsuite/run_sets/reposync.yml
+++ b/testsuite/run_sets/reposync.yml
@@ -13,5 +13,6 @@
 - features/reposync/srv_sync_products.feature
 - features/reposync/srv_enable_sync_products.feature
 - features/reposync/srv_wait_for_reposync.feature
+- features/reposync/srv_create_repository.feature
 
 ## Channels and Product synchronization features END ###