diff --git a/src/tinycss/tests/main.py b/src/tinycss/tests/main.py
index cd2fa3b4dc..30ec5c39a7 100644
--- a/src/tinycss/tests/main.py
+++ b/src/tinycss/tests/main.py
@@ -6,16 +6,12 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import unittest, os, argparse, importlib
+import unittest, os, argparse
 
 def find_tests():
+    from calibre.utils.run_tests import find_tests_in_dir
     base = os.path.dirname(os.path.abspath(__file__))
-    suits = []
-    for x in os.listdir(base):
-        if x.endswith('.py') and x != 'main.py':
-            m = importlib.import_module('tinycss.tests.' + x.partition('.')[0])
-            suits.append(unittest.defaultTestLoader.loadTestsFromModule(m))
-    return unittest.TestSuite(suits)
+    return find_tests_in_dir(base)
 
 def run_tests(find_tests=find_tests, for_build=False):
     if not for_build: