diff --git a/src/Products/ZCatalog/tests/test_brains.py b/src/Products/ZCatalog/tests/test_brains.py
index ba5edcb9..7c982f87 100644
--- a/src/Products/ZCatalog/tests/test_brains.py
+++ b/src/Products/ZCatalog/tests/test_brains.py
@@ -10,8 +10,6 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Unittests for Catalog brains
-"""
 
 import unittest
 
@@ -198,9 +196,3 @@ def testGetObjectRaisesNotFoundForMissing(self):
         self.assertEqual(b.getPath(), '/zonked')
         self.assertRaises(AttributeError, self.cat.getobject, 3)
         self.assertRaises((NotFound, AttributeError, KeyError), b.getObject)
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestBrains))
-    return suite
diff --git a/src/Products/ZCatalog/tests/test_catalog.py b/src/Products/ZCatalog/tests/test_catalog.py
index 94f7af27..fcedc708 100644
--- a/src/Products/ZCatalog/tests/test_catalog.py
+++ b/src/Products/ZCatalog/tests/test_catalog.py
@@ -10,8 +10,6 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-""" Unittests for Catalog.
-"""
 
 import unittest
 from Testing.ZopeTestCase.warnhook import WarningsHook
@@ -823,16 +821,3 @@ def test_combined_scored_search(self):
         brains = cat(title='1*', true=True)
         self.assertEqual(len(brains), 4)
         self.assertEqual(brains[0].title, '111')
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestAddDelColumn))
-    suite.addTest(unittest.makeSuite(TestAddDelIndexes))
-    suite.addTest(unittest.makeSuite(TestCatalog))
-    suite.addTest(unittest.makeSuite(TestRangeSearch))
-    suite.addTest(unittest.makeSuite(TestCatalogReturnAll))
-    suite.addTest(unittest.makeSuite(TestCatalogSearchArgumentsMap))
-    suite.addTest(unittest.makeSuite(TestMergeResults))
-    suite.addTest(unittest.makeSuite(TestScoring))
-    return suite
diff --git a/src/Products/ZCatalog/tests/test_lazy.py b/src/Products/ZCatalog/tests/test_lazy.py
index a1a20b8e..e2f7640f 100644
--- a/src/Products/ZCatalog/tests/test_lazy.py
+++ b/src/Products/ZCatalog/tests/test_lazy.py
@@ -10,13 +10,11 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""Unittests for Lazy sequence classes
-"""
 
 import unittest
 
 
-class BaseSequenceTest(unittest.TestCase):
+class BaseSequenceTest(object):
 
     def _compare(self, lseq, seq):
         self.assertEqual(len(lseq), len(seq))
@@ -32,7 +30,7 @@ def test_actual_result_count(self):
         self.assertEqual(lcat.actual_result_count, 20)
 
 
-class TestLazyCat(BaseSequenceTest):
+class TestLazyCat(unittest.TestCase, BaseSequenceTest):
 
     def _createLSeq(self, *sequences):
         from Products.ZCatalog.Lazy import LazyCat
@@ -262,7 +260,7 @@ def filter(x):
         self.assertEqual(len(lmop), letter_length)
 
 
-class TestLazyValues(BaseSequenceTest):
+class TestLazyValues(unittest.TestCase, BaseSequenceTest):
 
     def _createLSeq(self, seq):
         from Products.ZCatalog.Lazy import LazyValues
@@ -283,13 +281,3 @@ def test_slicing(self):
         seq = zip(letters, range(10))
         lvals = self._createLSeq(seq)
         self._compare(lvals[2:-2], range(2, 8))
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestLazyCat))
-    suite.addTest(unittest.makeSuite(TestLazyMap))
-    suite.addTest(unittest.makeSuite(TestLazyFilter))
-    suite.addTest(unittest.makeSuite(TestLazyMop))
-    suite.addTest(unittest.makeSuite(TestLazyValues))
-    return suite
diff --git a/src/Products/ZCatalog/tests/test_zcatalog.py b/src/Products/ZCatalog/tests/test_zcatalog.py
index 32db4493..abe64bae 100644
--- a/src/Products/ZCatalog/tests/test_zcatalog.py
+++ b/src/Products/ZCatalog/tests/test_zcatalog.py
@@ -10,8 +10,6 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-""" Unittests for ZCatalog
-"""
 
 import unittest
 
@@ -432,11 +430,3 @@ def test_unrestrictedGetObject_missing_raises_NotFound(self):
         del root.ob
         self.assertRaises((NotFound, AttributeError, KeyError),
                           brain._unrestrictedGetObject)
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestZCatalog))
-    suite.addTest(unittest.makeSuite(TestAddDelColumnIndex))
-    suite.addTest(unittest.makeSuite(TestZCatalogGetObject))
-    return suite