diff --git a/testsuite/features/build_validation/init_clients/proxy.feature b/testsuite/features/build_validation/init_clients/proxy.feature
index 9f4baeaaf83..4593ced06a8 100644
--- a/testsuite/features/build_validation/init_clients/proxy.feature
+++ b/testsuite/features/build_validation/init_clients/proxy.feature
@@ -17,7 +17,6 @@ Feature: Setup containerized proxy
 
   Scenario: Clean up sumaform leftovers on the containerized proxy
     When I perform a full salt minion cleanup on "proxy"
-    And I reboot the "proxy" host through SSH, waiting until it comes back
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section
diff --git a/testsuite/features/step_definitions/salt_steps.rb b/testsuite/features/step_definitions/salt_steps.rb
index 9599455ff8e..c81e9cb3aa7 100644
--- a/testsuite/features/step_definitions/salt_steps.rb
+++ b/testsuite/features/step_definitions/salt_steps.rb
@@ -532,6 +532,8 @@
       # Transactional systems could have also installed salt-minion via sumaform
       _result, code = node.run('rpm -q salt-minion', check_errors: false)
       node.run('transactional-update --continue -n pkg rm salt-minion', check_errors: false) if code.zero?
+      # Reboot needed here after package removal but before file removal
+      step %(I reboot the "#{host}" host through SSH, waiting until it comes back)
       node.run('rm -Rf /var/cache/salt/minion /var/run/salt /run/salt /var/log/salt /etc/salt', check_errors: false) if code.zero?
     elsif rh_host?(host)
       node.run('yum -y remove --setopt=clean_requirements_on_remove=1 venv-salt-minion', check_errors: false)
@@ -544,6 +546,8 @@
   else
     if transactional_system?(host)
       node.run('transactional-update --continue -n pkg rm salt salt-minion', check_errors: false)
+      # Reboot needed here after package removal but before file removal
+      step %(I reboot the "#{host}" host through SSH, waiting until it comes back)
     elsif rh_host?(host)
       node.run('yum -y remove --setopt=clean_requirements_on_remove=1 salt salt-minion', check_errors: false)
     elsif deb_host?(host)
@@ -553,6 +557,10 @@
     end
     node.run('rm -Rf /root/salt /var/cache/salt/minion /var/run/salt /run/salt /var/log/salt /etc/salt /var/tmp/.root*', check_errors: false)
   end
+  if transactional_system?(host)
+    # Reboot needed after file removal as well
+    step %(I reboot the "#{host}" host through SSH, waiting until it comes back)
+  end
   step %(I disable the repositories "tools_update_repo tools_pool_repo" on this "#{host}" without error control)
 end