diff --git a/tests/testIndex.py b/tests/testIndex.py
index df37aa4..43adc2b 100644
--- a/tests/testIndex.py
+++ b/tests/testIndex.py
@@ -159,11 +159,12 @@ class OkapiIndexTest(IndexTest):
 
 class TestIndexConflict(TestCase):
     
-    storage = None
+    db = None
 
     def tearDown(self):
-        if self.storage is not None:
-            self.storage.close()
+        if self.db is not None:
+            self.db.close()
+            self.storage.cleanup()
 
     def openDB(self):
         from ZODB.FileStorage import FileStorage
diff --git a/tests/testLexicon.py b/tests/testLexicon.py
index a9ac930..086cb92 100644
--- a/tests/testLexicon.py
+++ b/tests/testLexicon.py
@@ -146,11 +146,12 @@ def testUpgradeLength(self):
         
 class TestLexiconConflict(TestCase):
     
-    storage = None
+    db = None
 
     def tearDown(self):
-        if self.storage is not None:
-            self.storage.close()
+        if self.db is not None:
+            self.db.close()
+            self.storage.cleanup()
 
     def openDB(self):
         from ZODB.FileStorage import FileStorage