diff --git a/tests/installdbtests.py b/tests/installdbtests.py
index 7d244265..d47cd10f 100644
--- a/tests/installdbtests.py
+++ b/tests/installdbtests.py
@@ -17,19 +17,14 @@ class InstallDBTestCase(unittest.TestCase):
         
     def testInstall(self):
         installdb.purge('installtest')
-        installdb.install('installtest', '0.1', '2', './tests/sandbox/files.xml')
-        f = installdb.files('installtest')
-        a = f.readlines()
-        self.assertEqual(a[0], 'placeholder\n')
-        self.assert_(installdb.is_installed('installtest'))
+        installdb.install('installtest', '0.1', '2')
 
     def testRemovePurge(self):
-        installdb.install('installtest', '0.1', '2', './tests/sandbox/files.xml')
+        installdb.install('installtest', '0.1', '2')
         self.assert_(installdb.is_installed('installtest'))
         installdb.remove('installtest')
         self.assert_(installdb.is_removed('installtest'))
         installdb.purge('installtest')
         self.assert_(not installdb.is_recorded('installtest'))
-        self.assert_(not os.access(installdb.files_name('installtest', '0.1','2'), os.F_OK))
 
 suite = unittest.makeSuite(InstallDBTestCase)
diff --git a/tests/packagedbtests.py b/tests/packagedbtests.py
index 521f36dc..fca24392 100644
--- a/tests/packagedbtests.py
+++ b/tests/packagedbtests.py
@@ -2,7 +2,7 @@
 import unittest
 import os
 
-from pisi import packagedb
+from pisi.packagedb import PackageDB
 from pisi import util
 from pisi import context
 
@@ -10,15 +10,15 @@ class PackageDBTestCase(unittest.TestCase):
 
     def setUp(self):
         self.ctx = context.BuildContext('tests/popt/pspec.xml')
+        self.pdb = PackageDB('testdb')
         
     def testAdd(self):
-        packagedb.add_package(self.ctx.spec.packages[0])
-        self.assert_(packagedb.has_package('popt-libs'))
+        self.pdb.add_package(self.ctx.spec.packages[0])
+        self.assert_(self.pdb.has_package('popt-libs'))
     
     def testRemove(self):
-        self.testAdd()
-        packagedb.remove_package('popt-libs')
-        self.assert_(not packagedb.has_package('popt-libs'))
+        self.pdb.remove_package('popt-libs')
+        self.assert_(not self.pdb.has_package('popt-libs'))
 
 suite = unittest.makeSuite(PackageDBTestCase)