diff --git a/gramps/gui/logger/test/rotate_handler_test.py b/gramps/gui/logger/test/rotate_handler_test.py
index dbac74891..28aa7a33d 100644
--- a/gramps/gui/logger/test/rotate_handler_test.py
+++ b/gramps/gui/logger/test/rotate_handler_test.py
@@ -98,10 +98,5 @@ class RotateHandlerTest(unittest.TestCase):
         l.removeHandler(rh)
 
 
-def testSuite():
-    suite = unittest.makeSuite(RotateHandlerTest,'test')
-    return suite
-
-
 if __name__ == '__main__':
-    unittest.TextTestRunner().run(testSuite())
+    unittest.main()
diff --git a/gramps/plugins/db/bsddb/test/cursor_test.py b/gramps/plugins/db/bsddb/test/cursor_test.py
index 1e8fe1aa1..44ee375e1 100644
--- a/gramps/plugins/db/bsddb/test/cursor_test.py
+++ b/gramps/plugins/db/bsddb/test/cursor_test.py
@@ -223,10 +223,6 @@ class CursorTest(unittest.TestCase):
         pldata = set([d[1] for d in data])
         self.assertEqual(placenames, pldata)
 
-def testSuite():
-    suite = unittest.makeSuite(CursorTest, 'test')
-    return suite
-
 
 if __name__ == '__main__':
-    unittest.TextTestRunner().run(testSuite())
+    unittest.main()
diff --git a/gramps/plugins/db/bsddb/test/reference_map_test.py b/gramps/plugins/db/bsddb/test/reference_map_test.py
index e009a987e..1b6321ab7 100644
--- a/gramps/plugins/db/bsddb/test/reference_map_test.py
+++ b/gramps/plugins/db/bsddb/test/reference_map_test.py
@@ -214,12 +214,6 @@ class ReferenceMapTest(GrampsDbBaseTest):
         self.assertLess(with_reference_map, without_reference_map / 10,
                         "Reference_map should an order of magnitude faster.")
 
-def testSuite():
-    suite = unittest.makeSuite(ReferenceMapTest,'test')
-    return suite
-
-def perfSuite():
-    return unittest.makeSuite(ReferenceMapTest,'perf')
 
 if __name__ == '__main__':
-    unittest.TextTestRunner().run(testSuite())
+    unittest.main()