diff --git a/Lib/test/test_cpickle.py b/Lib/test/test_cpickle.py
index 8047bc54ee3..dda606f3a44 100644
--- a/Lib/test/test_cpickle.py
+++ b/Lib/test/test_cpickle.py
@@ -1,7 +1,8 @@
 import cPickle
+import test_support
+import unittest
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests
-from test_support import run_unittest
 
 class cPickleTests(AbstractPickleTests, AbstractPickleModuleTests):
 
@@ -79,8 +80,14 @@ class cPickleFastPicklerTests(AbstractPickleTests):
                           AbstractPickleTests.test_recursive_multi,
                           self)
 
+def test_main():
+    loader = unittest.TestLoader()
+    suite = unittest.TestSuite()
+    suite.addTest(loader.loadTestsFromTestCase(cPickleTests))
+    suite.addTest(loader.loadTestsFromTestCase(cPicklePicklerTests))
+    suite.addTest(loader.loadTestsFromTestCase(cPickleListPicklerTests))
+    suite.addTest(loader.loadTestsFromTestCase(cPickleFastPicklerTests))
+    test_support.run_suite(suite)
+
 if __name__ == "__main__":
-    run_unittest(cPickleTests)
-    run_unittest(cPicklePicklerTests)
-    run_unittest(cPickleListPicklerTests)
-    run_unittest(cPickleFastPicklerTests)
+    test_main()
diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index 06a554e05e3..6265676533b 100644
--- a/Lib/test/test_pickle.py
+++ b/Lib/test/test_pickle.py
@@ -1,7 +1,8 @@
 import pickle
+import test_support
+import unittest
 from cStringIO import StringIO
 from pickletester import AbstractPickleTests, AbstractPickleModuleTests
-from test_support import run_unittest
 
 class PickleTests(AbstractPickleTests, AbstractPickleModuleTests):
 
@@ -28,6 +29,12 @@ class PicklerTests(AbstractPickleTests):
         u = pickle.Unpickler(f)
         return u.load()
 
+def test_main():
+    loader = unittest.TestLoader()
+    suite = unittest.TestSuite()
+    suite.addTest(loader.loadTestsFromTestCase(PickleTests))
+    suite.addTest(loader.loadTestsFromTestCase(PicklerTests))
+    test_support.run_suite(suite)
+
 if __name__ == "__main__":
-    run_unittest(PickleTests)
-    run_unittest(PicklerTests)
+    test_main()