diff --git a/heat/engine/resources/volume.py b/heat/engine/resources/volume.py
index af76aae25a..493759283f 100644
--- a/heat/engine/resources/volume.py
+++ b/heat/engine/resources/volume.py
@@ -280,17 +280,10 @@ class VolumeDetachTask(object):
         yield
 
         try:
-            vol.get()
             while vol.status in ('in-use', 'detaching'):
                 logger.debug(_('%s - volume still in use') % str(self))
                 yield
 
-                try:
-                    server_api.delete_server_volume(self.server_id,
-                                                    self.attachment_id)
-                except (clients.novaclient.exceptions.BadRequest,
-                        clients.novaclient.exceptions.NotFound):
-                    pass
                 vol.get()
 
             logger.info(_('%(name)s - status: %(status)s') % {
diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py
index 5d8cda7972..c62697e138 100644
--- a/heat/tests/test_volume.py
+++ b/heat/tests/test_volume.py
@@ -332,10 +332,7 @@ class VolumeTest(HeatTestCase):
         self._mock_create_server_volume_script(fva)
 
         # delete script
-        fva = FakeVolume('i-use', 'available')
-        self.m.StubOutWithMock(fva, 'get')
-        fva.get().MultipleTimes()
-        fva.status = "in-use"
+        fva = FakeVolume('in-use', 'available')
 
         self.fc.volumes.get_server_volume(u'WikiDatabase',
                                           'vol-123').AndReturn(fva)
@@ -345,18 +342,6 @@ class VolumeTest(HeatTestCase):
             'WikiDatabase', 'vol-123').AndRaise(
                 clients.novaclient.exceptions.BadRequest('Already detached'))
 
-        self.fc.volumes.delete_server_volume(
-            'WikiDatabase', 'vol-123').AndRaise(
-                clients.novaclient.exceptions.NotFound('Not found'))
-
-        self.fc.volumes.delete_server_volume(
-            'WikiDatabase', 'vol-123').AndRaise(
-                clients.novaclient.exceptions.NotFound('Not found'))
-
-        self.fc.volumes.delete_server_volume(
-            'WikiDatabase', 'vol-123').AndRaise(
-                clients.cinderclient.exceptions.NotFound('Not found'))
-
         self.fc.volumes.get_server_volume(u'WikiDatabase',
                                           'vol-123').AndReturn(fva)
         self.fc.volumes.get_server_volume(