diff --git a/tests/installdbtests.py b/tests/installdbtests.py
index 93622b94..8d888eed 100644
--- a/tests/installdbtests.py
+++ b/tests/installdbtests.py
@@ -20,22 +20,25 @@ class InstallDBTestCase(unittest.TestCase):
 
     def setUp(self):
         pisi.api.init(database = True, comar = False)
-        self.installdb = ctx.installdb
+
 
     def testRemoveDummy(self):
-        self.installdb.remove('installtest')
-        self.assert_(not self.installdb.is_installed('installtest'))
+        ctx.installdb.remove('installtest')
+        self.assert_(not ctx.installdb.is_installed('installtest'))
+        pisi.api.finalize()
         
     def testInstall(self):
-        self.installdb.purge('installtest')
-        self.installdb.install('installtest', '0.1', '2', '3')
+        ctx.installdb.purge('installtest')
+        ctx.installdb.install('installtest', '0.1', '2', '3')
+        pisi.api.finalize()
 
     def testRemovePurge(self):
-        self.installdb.install('installtest', '0.1', '2', '3')
-        self.assert_(self.installdb.is_installed('installtest'))
-        self.installdb.remove('installtest')
-        self.assert_(self.installdb.is_removed('installtest'))
-        self.installdb.purge('installtest')
-        self.assert_(not self.installdb.is_recorded('installtest'))
+        ctx.installdb.install('installtest', '0.1', '2', '3')
+        self.assert_(ctx.installdb.is_installed('installtest'))
+        ctx.installdb.remove('installtest')
+        self.assert_(ctx.installdb.is_removed('installtest'))
+        ctx.installdb.purge('installtest')
+        self.assert_(not ctx.installdb.is_recorded('installtest'))
+        pisi.api.finalize()
 
 suite = unittest.makeSuite(InstallDBTestCase)
diff --git a/tests/packagedbtests.py b/tests/packagedbtests.py
index 5b72f561..175cd8e5 100644
--- a/tests/packagedbtests.py
+++ b/tests/packagedbtests.py
@@ -20,7 +20,6 @@ from pisi.specfile import SpecFile
 class PackageDBTestCase(unittest.TestCase):
 
     def setUp(self):
-        # setUp will be called for each test individually
         pisi.api.init(comar = False)
 
         self.spec = SpecFile()
@@ -32,12 +31,14 @@ class PackageDBTestCase(unittest.TestCase):
         self.pdb.add_package(self.spec.packages[0])
         self.assert_(self.pdb.has_package('popt-libs'))
         # close the database and remove lock
-        del self.pdb
+        self.pdb.close()
+        pisi.api.finalize()
     
     def testRemove(self):
         self.pdb.remove_package('popt-libs')
         self.assert_(not self.pdb.has_package('popt-libs'))
-        del self.pdb
+        self.pdb.close()
+        pisi.api.finalize()
 
 suite = unittest.makeSuite(PackageDBTestCase)