diff --git a/novaclient/tests/functional/v2/legacy/test_servers.py b/novaclient/tests/functional/v2/legacy/test_servers.py
index 86d035ae6..8976abd53 100644
--- a/novaclient/tests/functional/v2/legacy/test_servers.py
+++ b/novaclient/tests/functional/v2/legacy/test_servers.py
@@ -31,6 +31,11 @@ class TestServersBootNovaClient(base.ClientTestBase):
                                             imageRef=self.image.id)
         self.wait_for_volume_status(volume, "available")
 
+        if (len(bdm_params) >= 3 and bdm_params[2] == '1'):
+            delete_volume = False
+        else:
+            delete_volume = True
+
         bdm_params = ':'.join(bdm_params)
         if bdm_params:
             bdm_params = ''.join((':', bdm_params))
@@ -51,6 +56,10 @@ class TestServersBootNovaClient(base.ClientTestBase):
         self.client.servers.delete(server_id)
         self.wait_for_resource_delete(server_id, self.client.servers)
 
+        if delete_volume:
+            self.cinder.volumes.delete(volume.id)
+            self.wait_for_resource_delete(volume.id, self.cinder.volumes)
+
     def test_boot_server_with_legacy_bdm(self):
         # bdm v1 format
         # <id>:<type>:<size(GB)>:<delete-on-terminate>