diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index b87d342..543e7f4 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -226,14 +226,14 @@ class ScenarioTest(tempest.test.BaseTestCase):
                   name, image, flavor)
         _, server = self.servers_client.create_server(name, image, flavor,
                                                       **create_kwargs)
-        if wait_on_delete:
-            self.addCleanup(self.servers_client.wait_for_server_termination,
-                            server['id'])
-        self.addCleanup_with_wait(
-            waiter_callable=self.servers_client.wait_for_server_termination,
-            thing_id=server['id'], thing_id_param='server_id',
-            cleanup_callable=self.delete_wrapper,
-            cleanup_args=[self.servers_client.delete_server, server['id']])
+        #if wait_on_delete:
+        #    self.addCleanup(self.servers_client.wait_for_server_termination,
+        #                    server['id'])
+        #self.addCleanup_with_wait(
+        #    waiter_callable=self.servers_client.wait_for_server_termination,
+        #    thing_id=server['id'], thing_id_param='server_id',
+        #    cleanup_callable=self.delete_wrapper,
+        #    cleanup_args=[self.servers_client.delete_server, server['id']])
         if wait_on_boot:
             self.servers_client.wait_for_server_status(server_id=server['id'],
                                                        status='ACTIVE')