diff --git a/.gitignore b/.gitignore
index 69b7077498..9b364e6b05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 .bzr
 .bzrignore
 .build-cache
+.cache
 src/calibre/plugins
 resources/images.qrc
 manual/generated
diff --git a/setup/test.py b/setup/test.py
index 71efa6fe70..8483f127d5 100644
--- a/setup/test.py
+++ b/setup/test.py
@@ -8,7 +8,7 @@ import unittest
 
 from setup import Command
 
-TEST_MODULES = frozenset('srv db polish opf css docx cfi matcher icu smartypants build misc'.split())
+TEST_MODULES = frozenset('srv db polish opf css docx cfi matcher icu smartypants build misc library'.split())
 
 def find_tests(which_tests=None):
     ans = []
@@ -64,6 +64,9 @@ def find_tests(which_tests=None):
         a(find_tests())
         from calibre.utils.shared_file import find_tests
         a(find_tests())
+    if ok('library'):
+        from calibre.library.test import find_tests
+        a(find_tests())
 
     tests = unittest.TestSuite(ans)
     return tests
diff --git a/src/calibre/library/test.py b/src/calibre/library/test.py
index f1563fb996..ebeb27818a 100644
--- a/src/calibre/library/test.py
+++ b/src/calibre/library/test.py
@@ -10,10 +10,10 @@ Unit tests for database layer.
 import sys, unittest, os, cStringIO
 from itertools import repeat
 
-from calibre.ptempfile import PersistentTemporaryDirectory
-from calibre.library.database2 import LibraryDatabase2
 from calibre.ebooks.metadata import MetaInformation
-
+from calibre.library.database2 import LibraryDatabase2
+from calibre.ptempfile import PersistentTemporaryDirectory
+from calibre.utils.run_tests import find_tests_in_dir, run_tests
 
 class DBTest(unittest.TestCase):
 
@@ -89,12 +89,13 @@ class DBTest(unittest.TestCase):
         self.assertEqual(self.db.rating(0), 3)
 
 
-def suite():
-    return unittest.TestLoader().loadTestsFromTestCase(DBTest)
+def find_tests():
+    base = os.path.dirname(os.path.abspath(__file__))
+    return find_tests_in_dir(base)
 
 
 def test():
-    unittest.TextTestRunner(verbosity=2).run(suite())
+    run_tests(find_tests())
 
 
 def main(args=sys.argv):