diff --git a/testsuite/Rakefile b/testsuite/Rakefile
index 4297d52cdb5..45335fc6031 100644
--- a/testsuite/Rakefile
+++ b/testsuite/Rakefile
@@ -219,11 +219,13 @@ namespace :jenkins do
     minions = args[:instances]
     minions.each do |minion|
       next if minion.include?('proxy') or minion.include?('monitoring')
+      # WORKAROUND: renaming should be removed once this issue is done https://github.com/SUSE/spacewalk/issues/25591
+      modified_client = minion.gsub(/ssh_minion$/, 'sshminion')
       Rake::Task['jenkins:generate_rake_run_step'].invoke(
         '',
-        File.basename(minion,'.feature'),
+        File.basename(minion, '.feature'),
         'features/build_validation/init_clients',
-        "run_sets/build_validation/build_validation_init_client_#{minion}.yml"
+        "run_sets/build_validation/build_validation_init_client_#{modified_client}.yml"
       )
       Rake::Task['jenkins:generate_rake_run_step'].reenable
     end
@@ -249,11 +251,13 @@ namespace :jenkins do
   task :generate_rake_files_add_activation_keys, [:instances] do |_t, args|
     minions = args[:instances]
     minions.each do |minion|
+      # WORKAROUND: renaming should be removed once this issue is done https://github.com/SUSE/spacewalk/issues/25591
+      modified_client = minion.gsub(/ssh_minion$/, 'sshminion')
       Rake::Task['jenkins:generate_rake_run_step'].invoke(
         '_add_activation_key',
         File.basename(minion, '.feature'),
         'features/build_validation/add_activation_keys',
-        "run_sets/build_validation/build_validation_add_activation_key_#{minion}.yml"
+        "run_sets/build_validation/build_validation_add_activation_key_#{modified_client}.yml"
       )
       Rake::Task['jenkins:generate_rake_run_step'].reenable
     end
@@ -264,12 +268,14 @@ namespace :jenkins do
     minions = args[:instances]
     minions.each do |minion|
       next if minion.include?('proxy') || minion.include?('monitoring')
+      # WORKAROUND: renaming should be removed once this issue is done https://github.com/SUSE/spacewalk/issues/25591
+      modified_client = minion.gsub(/ssh_minion$/, 'sshminion')
 
       Rake::Task['jenkins:generate_rake_run_step'].invoke(
         '_smoke_tests',
         File.basename(minion, '.feature'),
         'features/build_validation/smoke_tests',
-        "run_sets/build_validation/build_validation_smoke_tests_#{minion}.yml"
+        "run_sets/build_validation/build_validation_smoke_tests_#{modified_client}.yml"
       )
       Rake::Task['jenkins:generate_rake_run_step'].reenable
     end