Merge "Create or attach interface should use specific network"
diff --git a/patrole_tempest_plugin/tests/api/compute/test_server_misc_policy_actions_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_server_misc_policy_actions_rbac.py
index 4e9e8a0..d393a4c 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_server_misc_policy_actions_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_server_misc_policy_actions_rbac.py
@@ -419,6 +419,8 @@
         """Test rescue server, part of os-rescue."""
         with self.rbac_utils.override_role(self):
             self.servers_client.rescue_server(self.server['id'])
+        waiters.wait_for_server_status(
+            self.servers_client, self.server['id'], 'RESCUE')
 
     @decorators.idempotent_id('ac2d956f-d6a3-4184-b814-b44d05c9574c')
     @utils.requires_ext(extension='os-rescue', service='compute')
@@ -433,7 +435,8 @@
 
         with self.rbac_utils.override_role(self):
             self.servers_client.unrescue_server(self.server['id'])
-        # `setUp` will wait for the server to reach 'ACTIVE' for next test.
+        waiters.wait_for_server_status(
+            self.servers_client, self.server['id'], 'ACTIVE')
 
     @utils.requires_ext(extension='os-server-diagnostics', service='compute')
     @rbac_rule_validation.action(