diff --git a/patrole_tempest_plugin/tests/api/compute/test_server_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_server_rbac.py
index a9d746c..cae31f6 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_server_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_server_rbac.py
@@ -102,7 +102,7 @@
                       'source_type': 'volume',
                       'destination_type': 'volume',
                       'boot_index': 0,
-                      'delete_on_termination': True}]
+                      'delete_on_termination': False}]
         device_mapping = {'block_device_mapping_v2': bd_map_v2}
 
         with self.rbac_utils.override_role(self):
@@ -112,6 +112,8 @@
                 flavorRef=CONF.compute.flavor_ref,
                 imageRef='',
                 **device_mapping)['server']
+        waiters.wait_for_server_status(
+            self.servers_client, server['id'], 'ACTIVE')
         # Delete the server and wait for the volume to become available to
         # avoid clean up errors.
         self.addCleanup(test_utils.call_and_ignore_notfound_exc,