diff --git a/testsuite/features/secondary/srv_rename_hostname.feature b/testsuite/features/secondary/srv_rename_hostname.feature
index 1f15f0bf2ab2..2897cd5248e3 100644
--- a/testsuite/features/secondary/srv_rename_hostname.feature
+++ b/testsuite/features/secondary/srv_rename_hostname.feature
@@ -26,9 +26,9 @@ Feature: Reconfigure the server's hostname
     When I copy server's keys to the proxy
     And I configure the proxy
     Then I should see "proxy" via spacecmd
-    And I restart the "salt-minion" service on "proxy"
+    When I restart the "salt-minion" service on "proxy"
     Then service "salt-minion" is active on "proxy"
-    And I restart the "salt-broker" service on "proxy"
+    When I restart the "salt-broker" service on "proxy"
     Then service "salt-broker" is active on "proxy"
 
 @proxy
@@ -92,9 +92,9 @@ Feature: Reconfigure the server's hostname
     And I configure the proxy
     Then I should see "proxy" via spacecmd
     And I restart the "salt-minion" service on "proxy"
-    Then service "salt-minion" is active on "proxy"
+    When service "salt-minion" is active on "proxy"
     And I restart the "salt-broker" service on "proxy"
-    Then service "salt-broker" is active on "proxy"
+    When service "salt-broker" is active on "proxy"
 
 @proxy
   Scenario: Apply high state on the proxy to populate new server CA