diff --git a/nova/tests/storage_unittest.py b/nova/tests/storage_unittest.py
index 36fcc6f19ae4..e1377eeb86bd 100644
--- a/nova/tests/storage_unittest.py
+++ b/nova/tests/storage_unittest.py
@@ -68,11 +68,17 @@ class StorageTestCase(test.TrialTestCase):
         project_id = 'fake'
         num_shelves = FLAGS.last_shelf_id - FLAGS.first_shelf_id + 1
         total_slots = FLAGS.slots_per_shelf * num_shelves
+        vols = []
         for i in xrange(total_slots):
-            self.mystorage.create_volume(vol_size, user_id, project_id)
+            vid = self.mystorage.create_volume(vol_size, user_id, project_id)
+            print vid
+            vols.append(vid)
         self.assertRaises(storage.NoMoreVolumes,
                           self.mystorage.create_volume,
                           vol_size, user_id, project_id)
+        for id in vols:
+            print id
+            self.mystorage.delete_volume(id)
 
     def test_run_attach_detach_volume(self):
         # Create one volume and one node to test with
diff --git a/nova/volume/storage.py b/nova/volume/storage.py
index 288ab76ba4b8..e329448156ec 100644
--- a/nova/volume/storage.py
+++ b/nova/volume/storage.py
@@ -99,8 +99,12 @@ class BlockStore(object):
         self._init_volume_group()
 
     def __del__(self):
+        # TODO(josh): Get rid of this destructor, volumes destroy themselves
         if FLAGS.fake_storage:
-            shutil.rmtree(FLAGS.aoe_export_dir)
+            try:
+                shutil.rmtree(FLAGS.aoe_export_dir)
+            except Exception, err:
+                pass
 
     def report_state(self):
         #TODO: aggregate the state of the system
@@ -163,7 +167,7 @@ class Volume(datastore.BasicModel):
 
     @property
     def identifier(self):
-        self.volume_id
+        return self.volume_id
 
     def default_state(self):
         return {"volume_id": self.volume_id}