diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index bae8296..bc5ff5d 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -192,14 +192,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')
@@ -218,17 +218,17 @@ class ScenarioTest(tempest.test.BaseTestCase):
             size=size, display_name=name, snapshot_id=snapshot_id,
             imageRef=imageRef, volume_type=volume_type)

-        if wait_on_delete:
-            self.addCleanup(self.volumes_client.wait_for_resource_deletion,
-                            volume['id'])
-            self.addCleanup(self.delete_wrapper,
-                            self.volumes_client.delete_volume, volume['id'])
-        else:
-            self.addCleanup_with_wait(
-                waiter_callable=self.volumes_client.wait_for_resource_deletion,
-                thing_id=volume['id'], thing_id_param='id',
-                cleanup_callable=self.delete_wrapper,
-                cleanup_args=[self.volumes_client.delete_volume, volume['id']])
+        #if wait_on_delete:
+        #    self.addCleanup(self.volumes_client.wait_for_resource_deletion,
+        #                    volume['id'])
+        #    self.addCleanup(self.delete_wrapper,
+        #                    self.volumes_client.delete_volume, volume['id'])
+        #else:
+        #    self.addCleanup_with_wait(
+        #        waiter_callable=self.volumes_client.wait_for_resource_deletion,
+        #        thing_id=volume['id'], thing_id_param='id',
+        #        cleanup_callable=self.delete_wrapper,
+        #        cleanup_args=[self.volumes_client.delete_volume, volume['id']])

         self.assertEqual(name, volume['display_name'])
         self.volumes_client.wait_for_volume_status(volume['id'], 'available')