diff -r 48126f225f10 Lib/test/datetimetester.py
--- a/Lib/test/datetimetester.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/datetimetester.py	Fri Jun 13 08:19:38 2014 -0500
@@ -3768,8 +3768,5 @@
         self.assertEqual(as_datetime, datetime_sc)
         self.assertEqual(datetime_sc, as_datetime)
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test___future__.py
--- a/Lib/test/test___future__.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test___future__.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,5 +1,4 @@
 import unittest
-from test import support
 import __future__
 
 GOOD_SERIALS = ("alpha", "beta", "candidate", "final")
@@ -58,8 +57,5 @@
                    ".compiler_flag isn't int")
 
 
-def test_main():
-    support.run_unittest(FutureTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test__locale.py
--- a/Lib/test/test__locale.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test__locale.py	Fri Jun 13 08:19:38 2014 -0500
@@ -9,7 +9,6 @@
 import sys
 import unittest
 from platform import uname
-from test.support import run_unittest
 
 if uname().system == "Darwin":
     maj, min, mic = [int(part) for part in uname().release.split(".")]
@@ -163,8 +162,5 @@
                 self.assertRaises(ValueError, float,
                                   localeconv()['decimal_point'].join(['1', '23']))
 
-def test_main():
-    run_unittest(_LocaleTests)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test__opcode.py
--- a/Lib/test/test__opcode.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test__opcode.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,5 +1,5 @@
 import dis
-from test.support import run_unittest, import_module
+from test.support import import_module
 import unittest
 
 _opcode = import_module("_opcode")
@@ -16,8 +16,5 @@
         self.assertRaises(ValueError, _opcode.stack_effect, dis.opmap['BUILD_SLICE'])
         self.assertRaises(ValueError, _opcode.stack_effect, dis.opmap['POP_TOP'], 0)
 
-def test_main():
-    run_unittest(OpcodeTests)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test__osx_support.py
--- a/Lib/test/test__osx_support.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test__osx_support.py	Fri Jun 13 08:19:38 2014 -0500
@@ -271,9 +271,5 @@
         result = _osx_support.get_platform_osx(config_vars, ' ', ' ', ' ')
         self.assertEqual(('macosx', '10.6', 'fat'), result)
 
-def test_main():
-    if sys.platform == 'darwin':
-        test.support.run_unittest(Test_OSXSupport)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_atexit.py
--- a/Lib/test/test_atexit.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_atexit.py	Fri Jun 13 08:19:38 2014 -0500
@@ -177,9 +177,5 @@
         self.assertEqual(atexit._ncallbacks(), n)
 
 
-def test_main():
-    support.run_unittest(__name__)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_augassign.py
--- a/Lib/test/test_augassign.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_augassign.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,6 +1,5 @@
 # Augmented assignment test.
 
-from test.support import run_unittest
 import unittest
 
 
@@ -308,8 +307,5 @@
 __ilshift__ called
 '''.splitlines())
 
-def test_main():
-    run_unittest(AugAssignTest)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_binascii.py
--- a/Lib/test/test_binascii.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_binascii.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,6 +1,5 @@
 """Test the binascii C module."""
 
-from test import support
 import unittest
 import binascii
 import array
@@ -260,11 +259,5 @@
     type2test = memoryview
 
 
-def test_main():
-    support.run_unittest(BinASCIITest,
-                         ArrayBinASCIITest,
-                         BytearrayBinASCIITest,
-                         MemoryviewBinASCIITest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_binop.py
--- a/Lib/test/test_binop.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_binop.py	Fri Jun 13 08:19:38 2014 -0500
@@ -373,8 +373,5 @@
         self.assertEqual(op_sequence(le, B, C), ['C.__ge__', 'B.__le__'])
         self.assertEqual(op_sequence(le, C, B), ['C.__le__', 'B.__ge__'])
 
-def test_main():
-    support.run_unittest(RatTestCase, OperationOrderTests)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_calendar.py
--- a/Lib/test/test_calendar.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_calendar.py	Fri Jun 13 08:19:38 2014 -0500
@@ -697,18 +697,5 @@
         (return_code, stdout, stderr) = assert_python_ok('-m', 'calendar', '--type=html', '2010')
         self.assertEqual(stdout[:6], b'<?xml ')
 
-def test_main():
-    support.run_unittest(
-        OutputTestCase,
-        CalendarTestCase,
-        MondayTestCase,
-        SundayTestCase,
-        TimegmTestCase,
-        MonthRangeTestCase,
-        LeapdaysTestCase,
-        ConsoleOutputTestCase
-    )
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_call.py
--- a/Lib/test/test_call.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_call.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,5 +1,4 @@
 import unittest
-from test import support
 
 # The test cases here cover several paths through the function calling
 # code.  They depend on the METH_XXX flag that is used to define a C
@@ -123,9 +122,5 @@
         self.assertRaises(TypeError, [].count, x=2, y=2)
 
 
-def test_main():
-    support.run_unittest(CFunctionCalls)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_cgi.py
--- a/Lib/test/test_cgi.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_cgi.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,4 +1,4 @@
-from test.support import run_unittest, check_warnings
+from test.support import check_warnings
 import cgi
 import os
 import sys
@@ -482,8 +482,5 @@
 """
 
 
-def test_main():
-    run_unittest(CgiTests)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_cgitb.py
--- a/Lib/test/test_cgitb.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_cgitb.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,4 +1,3 @@
-from test.support import run_unittest
 from test.script_helper import assert_python_failure, temp_dir
 import unittest
 import sys
@@ -63,8 +62,5 @@
         self.assertNotIn('</p>', out)
 
 
-def test_main():
-    run_unittest(TestCgitb)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_charmapcodec.py
--- a/Lib/test/test_charmapcodec.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_charmapcodec.py	Fri Jun 13 08:19:38 2014 -0500
@@ -49,8 +49,5 @@
     def test_maptoundefined(self):
         self.assertRaises(UnicodeError, str, b'abc\001', codecname)
 
-def test_main():
-    test.support.run_unittest(CharmapCodecTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_class.py
--- a/Lib/test/test_class.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_class.py	Fri Jun 13 08:19:38 2014 -0500
@@ -2,7 +2,6 @@
 
 import unittest
 
-from test import support
 
 testmeths = [
 
@@ -545,8 +544,5 @@
         a = A(hash(A.f)^(-1))
         hash(a.f)
 
-def test_main():
-    support.run_unittest(ClassTests)
-
-if __name__=='__main__':
-    test_main()
+if __name__ == '__main__':
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_cmath.py
--- a/Lib/test/test_cmath.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_cmath.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,4 +1,4 @@
-from test.support import run_unittest, requires_IEEE_754
+from test.support import requires_IEEE_754
 from test.test_math import parse_testfile, test_file
 import unittest
 import cmath, math
@@ -529,8 +529,5 @@
             self.assertComplexIdentical(cmath.atanh(z), z)
 
 
-def test_main():
-    run_unittest(CMathTests)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_code_module.py
--- a/Lib/test/test_code_module.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_code_module.py	Fri Jun 13 08:19:38 2014 -0500
@@ -79,8 +79,5 @@
         self.assertEqual(len(self.stderr.method_calls), 1)
 
 
-def test_main():
-    support.run_unittest(TestInteractiveConsole)
-
 if __name__ == "__main__":
     unittest.main()
diff -r 48126f225f10 Lib/test/test_codecencodings_cn.py
--- a/Lib/test/test_codecencodings_cn.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codecencodings_cn.py	Fri Jun 13 08:19:38 2014 -0500
@@ -83,8 +83,5 @@
         (b"ab~{\x79\x79\x41\x44~}cd", "replace", "ab\ufffd\ufffd\u804acd"),
     )
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_codecencodings_hk.py
--- a/Lib/test/test_codecencodings_hk.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codecencodings_hk.py	Fri Jun 13 08:19:38 2014 -0500
@@ -19,8 +19,5 @@
         (b"abc\x80\x80\xc1\xc4", "ignore",  "abc\u8b10"),
     )
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_codecencodings_iso2022.py
--- a/Lib/test/test_codecencodings_iso2022.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codecencodings_iso2022.py	Fri Jun 13 08:19:38 2014 -0500
@@ -38,8 +38,5 @@
     def test_chunkcoding(self):
         pass
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_codecencodings_jp.py
--- a/Lib/test/test_codecencodings_jp.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codecencodings_jp.py	Fri Jun 13 08:19:38 2014 -0500
@@ -123,8 +123,5 @@
         b"\x85G&real;\x85Q = &lang;&#4660;&rang;"
     )
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_codecencodings_kr.py
--- a/Lib/test/test_codecencodings_kr.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codecencodings_kr.py	Fri Jun 13 08:19:38 2014 -0500
@@ -66,8 +66,5 @@
         (b"\x8CBxy", "replace",  "\uFFFDBxy"),
     )
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_codecencodings_tw.py
--- a/Lib/test/test_codecencodings_tw.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codecencodings_tw.py	Fri Jun 13 08:19:38 2014 -0500
@@ -19,8 +19,5 @@
         (b"abc\x80\x80\xc1\xc4", "ignore",  "abc\u8b10"),
     )
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_codecmaps_cn.py
--- a/Lib/test/test_codecmaps_cn.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codecmaps_cn.py	Fri Jun 13 08:19:38 2014 -0500
@@ -25,8 +25,5 @@
                  'trunk/charset/data/xml/gb-18030-2000.xml'
 
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_codecmaps_hk.py
--- a/Lib/test/test_codecmaps_hk.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codecmaps_hk.py	Fri Jun 13 08:19:38 2014 -0500
@@ -12,8 +12,5 @@
     encoding = 'big5hkscs'
     mapfileurl = 'http://people.freebsd.org/~perky/i18n/BIG5HKSCS-2004.TXT'
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_codecmaps_jp.py
--- a/Lib/test/test_codecmaps_jp.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codecmaps_jp.py	Fri Jun 13 08:19:38 2014 -0500
@@ -59,8 +59,5 @@
     mapfileurl = 'http://people.freebsd.org/~perky/i18n/SHIFT_JISX0213.TXT'
 
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_codecmaps_kr.py
--- a/Lib/test/test_codecmaps_kr.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codecmaps_kr.py	Fri Jun 13 08:19:38 2014 -0500
@@ -36,8 +36,5 @@
     pass_enctest = [(b'\\', '\u20a9')]
     pass_dectest = [(b'\\', '\u20a9')]
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_codecmaps_tw.py
--- a/Lib/test/test_codecmaps_tw.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codecmaps_tw.py	Fri Jun 13 08:19:38 2014 -0500
@@ -26,8 +26,5 @@
         (b"\xFFxy", "replace",  "\ufffdxy"),
     )
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_codeop.py
--- a/Lib/test/test_codeop.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_codeop.py	Fri Jun 13 08:19:38 2014 -0500
@@ -3,7 +3,7 @@
    Nick Mathewson
 """
 import unittest
-from test.support import run_unittest, is_jython
+from test.support import is_jython
 
 from codeop import compile_command, PyCF_DONT_IMPLY_DEDENT
 import io
@@ -296,9 +296,5 @@
                             compile("a = 1\n", "def", 'single').co_filename)
 
 
-def test_main():
-    run_unittest(CodeopTests)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_compare.py
--- a/Lib/test/test_compare.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_compare.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,5 +1,4 @@
 import unittest
-from test import support
 
 class Empty:
     def __repr__(self):
@@ -60,8 +59,5 @@
         self.assertEqual(Anything(), y)
 
 
-def test_main():
-    support.run_unittest(ComparisonTest)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_contains.py
--- a/Lib/test/test_contains.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_contains.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,5 +1,4 @@
 from collections import deque
-from test.support import run_unittest
 import unittest
 
 
@@ -86,8 +85,5 @@
             self.assertTrue(container == container)
 
 
-def test_main():
-    run_unittest(TestContains)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_copy.py
--- a/Lib/test/test_copy.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_copy.py	Fri Jun 13 08:19:38 2014 -0500
@@ -7,7 +7,6 @@
 from operator import le, lt, ge, gt, eq, ne
 
 import unittest
-from test import support
 
 order_comparisons = le, lt, ge, gt
 equality_comparisons = eq, ne
@@ -752,8 +751,5 @@
 
 def global_foo(x, y): return x+y
 
-def test_main():
-    support.run_unittest(TestCopy)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_copyreg.py
--- a/Lib/test/test_copyreg.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_copyreg.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,6 @@
 import copyreg
 import unittest
 
-from test import support
 from test.pickletester import ExtensionSaver
 
 class C:
@@ -113,9 +112,5 @@
         self.assertEqual(result, expected)
 
 
-def test_main():
-    support.run_unittest(CopyRegTestCase)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_crashers.py
--- a/Lib/test/test_crashers.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_crashers.py	Fri Jun 13 08:19:38 2014 -0500
@@ -30,9 +30,8 @@
             assert_python_failure(fname)
 
 
-def test_main():
-    test.support.run_unittest(CrasherTest)
+def tearDownModule():
     test.support.reap_children()
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_csv.py
--- a/Lib/test/test_csv.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_csv.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1064,11 +1064,5 @@
 
 
 
-def test_main():
-    mod = sys.modules[__name__]
-    support.run_unittest(
-        *[getattr(mod, name) for name in dir(mod) if name.startswith('Test')]
-    )
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_decorators.py
--- a/Lib/test/test_decorators.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_decorators.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,5 +1,4 @@
 import unittest
-from test import support
 
 def funcattrs(**kwds):
     def decorate(func):
@@ -301,9 +300,5 @@
         class C(object): pass
         self.assertEqual(C.extra, 'second')
 
-def test_main():
-    support.run_unittest(TestDecorators)
-    support.run_unittest(TestClassDecorators)
-
-if __name__=="__main__":
-    test_main()
+if __name__ == "__main__":
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_defaultdict.py
--- a/Lib/test/test_defaultdict.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_defaultdict.py	Fri Jun 13 08:19:38 2014 -0500
@@ -5,7 +5,6 @@
 import pickle
 import tempfile
 import unittest
-from test import support
 
 from collections import defaultdict
 
@@ -183,8 +182,5 @@
             o = pickle.loads(s)
             self.assertEqual(d, o)
 
-def test_main():
-    support.run_unittest(TestDefaultDict)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_dict.py
--- a/Lib/test/test_dict.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_dict.py	Fri Jun 13 08:19:38 2014 -0500
@@ -917,12 +917,5 @@
 class SubclassMappingTests(mapping_tests.BasicTestMappingProtocol):
     type2test = Dict
 
-def test_main():
-    support.run_unittest(
-        DictTest,
-        GeneralMappingTests,
-        SubclassMappingTests,
-    )
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_dictviews.py
--- a/Lib/test/test_dictviews.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_dictviews.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,5 +1,4 @@
 import unittest
-from test import support
 
 class DictSetTest(unittest.TestCase):
 
@@ -199,8 +198,5 @@
         self.assertRaises(RuntimeError, repr, d)
 
 
-def test_main():
-    support.run_unittest(DictSetTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_dis.py
--- a/Lib/test/test_dis.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_dis.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,6 +1,6 @@
 # Minimal tests for dis module
 
-from test.support import run_unittest, captured_stdout
+from test.support import captured_stdout
 from test.bytecode_helper import BytecodeTestCase
 import difflib
 import unittest
diff -r 48126f225f10 Lib/test/test_docxmlrpc.py
--- a/Lib/test/test_docxmlrpc.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_docxmlrpc.py	Fri Jun 13 08:19:38 2014 -0500
@@ -212,8 +212,5 @@
             response.read())
 
 
-def test_main():
-    support.run_unittest(DocXMLRPCHTTPGETServer)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_dummy_threading.py
--- a/Lib/test/test_dummy_threading.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_dummy_threading.py	Fri Jun 13 08:19:38 2014 -0500
@@ -56,9 +56,5 @@
         if support.verbose:
             print('all tasks done')
 
-def test_main():
-    support.run_unittest(DummyThreadingTestCase)
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_dynamic.py
--- a/Lib/test/test_dynamic.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_dynamic.py	Fri Jun 13 08:19:38 2014 -0500
@@ -4,7 +4,7 @@
 import contextlib
 import unittest
 
-from test.support import run_unittest, swap_item, swap_attr
+from test.support import swap_item, swap_attr
 
 
 class RebindBuiltinsTests(unittest.TestCase):
@@ -135,9 +135,5 @@
         self.assertEqual(foo(), 7)
 
 
-def test_main():
-    run_unittest(RebindBuiltinsTests)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_dynamicclassattribute.py
--- a/Lib/test/test_dynamicclassattribute.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_dynamicclassattribute.py	Fri Jun 13 08:19:38 2014 -0500
@@ -4,7 +4,6 @@
 import abc
 import sys
 import unittest
-from test.support import run_unittest
 from types import DynamicClassAttribute
 
 class PropertyBase(Exception):
@@ -297,8 +296,5 @@
 
 
 
-def test_main():
-    run_unittest(PropertyTests, PropertySubclassTests)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_ensurepip.py
--- a/Lib/test/test_ensurepip.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_ensurepip.py	Fri Jun 13 08:19:38 2014 -0500
@@ -342,4 +342,4 @@
 
 
 if __name__ == "__main__":
-    test.support.run_unittest(__name__)
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_enumerate.py
--- a/Lib/test/test_enumerate.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_enumerate.py	Fri Jun 13 08:19:38 2014 -0500
@@ -257,16 +257,5 @@
                        (sys.maxsize+3,'c')]
 
 
-def test_main(verbose=None):
-    support.run_unittest(__name__)
-
-    # verify reference counting
-    if verbose and hasattr(sys, "gettotalrefcount"):
-        counts = [None] * 5
-        for i in range(len(counts)):
-            support.run_unittest(__name__)
-            counts[i] = sys.gettotalrefcount()
-        print(counts)
-
 if __name__ == "__main__":
-    test_main(verbose=True)
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_eof.py
--- a/Lib/test/test_eof.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_eof.py	Fri Jun 13 08:19:38 2014 -0500
@@ -24,8 +24,5 @@
         else:
             raise support.TestFailed
 
-def test_main():
-    support.run_unittest(EOFTestCase)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_epoll.py
--- a/Lib/test/test_epoll.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_epoll.py	Fri Jun 13 08:19:38 2014 -0500
@@ -252,8 +252,5 @@
         self.assertEqual(os.get_inheritable(epoll.fileno()), False)
 
 
-def test_main():
-    support.run_unittest(TestEPoll)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_errno.py
--- a/Lib/test/test_errno.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_errno.py	Fri Jun 13 08:19:38 2014 -0500
@@ -3,7 +3,6 @@
 """
 
 import errno
-from test import support
 import unittest
 
 std_c_errors = frozenset(['EDOM', 'ERANGE'])
@@ -32,9 +31,5 @@
                               'no %s attr in errno.errorcode' % attribute)
 
 
-def test_main():
-    support.run_unittest(ErrnoAttributeTests, ErrorcodeTests)
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_exception_variations.py
--- a/Lib/test/test_exception_variations.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_exception_variations.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,5 +1,4 @@
 
-from test.support import run_unittest
 import unittest
 
 class ExceptionTestCase(unittest.TestCase):
@@ -173,8 +172,5 @@
         self.assertTrue(hit_finally)
         self.assertTrue(hit_except)
 
-def test_main():
-    run_unittest(ExceptionTestCase)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_file_eintr.py
--- a/Lib/test/test_file_eintr.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_file_eintr.py	Fri Jun 13 08:19:38 2014 -0500
@@ -13,7 +13,6 @@
 import signal
 import subprocess
 import sys
-from test.support import run_unittest
 import time
 import unittest
 
@@ -225,12 +224,5 @@
                         expected="hello\nworld!\n"))
 
 
-def test_main():
-    test_cases = [
-            tc for tc in globals().values()
-            if isinstance(tc, type) and issubclass(tc, unittest.TestCase)]
-    run_unittest(*test_cases)
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_finalization.py
--- a/Lib/test/test_finalization.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_finalization.py	Fri Jun 13 08:19:38 2014 -0500
@@ -515,8 +515,5 @@
         self.assertIs(wr(), None)
 
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_float.py
--- a/Lib/test/test_float.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_float.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1295,18 +1295,5 @@
                 self.identical(x, fromHex(toHex(x)))
 
 
-def test_main():
-    support.run_unittest(
-        GeneralFloatCases,
-        FormatFunctionsTestCase,
-        UnknownFormatTestCase,
-        IEEEFormatTestCase,
-        FormatTestCase,
-        ReprTestCase,
-        RoundTestCase,
-        InfNanTest,
-        HexFloatTestCase,
-        )
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_flufl.py
--- a/Lib/test/test_flufl.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_flufl.py	Fri Jun 13 08:19:38 2014 -0500
@@ -18,10 +18,5 @@
                             '<FLUFL test>', 'exec')
 
 
-def test_main():
-    from test.support import run_unittest
-    run_unittest(FLUFLTests)
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_fnmatch.py
--- a/Lib/test/test_fnmatch.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_fnmatch.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,6 +1,5 @@
 """Test cases for the fnmatch module."""
 
-from test import support
 import unittest
 
 from fnmatch import fnmatch, fnmatchcase, translate, filter
@@ -79,11 +78,5 @@
         self.assertEqual(filter(['a', 'b'], 'a'), ['a'])
 
 
-def test_main():
-    support.run_unittest(FnmatchTestCase,
-                         TranslateTestCase,
-                         FilterTestCase)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_fork1.py
--- a/Lib/test/test_fork1.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_fork1.py	Fri Jun 13 08:19:38 2014 -0500
@@ -8,7 +8,7 @@
 import time
 
 from test.fork_wait import ForkWait
-from test.support import (run_unittest, reap_children, get_attribute,
+from test.support import (reap_children, get_attribute,
                           import_module, verbose)
 
 threading = import_module('threading')
@@ -103,9 +103,8 @@
             fork_with_import_lock(level)
 
 
-def test_main():
-    run_unittest(ForkTest)
+def tearDownModule():
     reap_children()
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_fractions.py
--- a/Lib/test/test_fractions.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_fractions.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,7 @@
 """Tests for Lib/fractions.py."""
 
 from decimal import Decimal
-from test.support import run_unittest, requires_IEEE_754
+from test.support import requires_IEEE_754
 import math
 import numbers
 import operator
@@ -605,8 +605,5 @@
         r = F(13, 7)
         self.assertRaises(AttributeError, setattr, r, 'a', 10)
 
-def test_main():
-    run_unittest(FractionTest, GcdTest)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_frame.py
--- a/Lib/test/test_frame.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_frame.py	Fri Jun 13 08:19:38 2014 -0500
@@ -109,8 +109,5 @@
             self.assertIs(None, wr())
 
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_funcattrs.py
--- a/Lib/test/test_funcattrs.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_funcattrs.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,4 +1,3 @@
-from test import support
 import types
 import unittest
 
@@ -374,12 +373,5 @@
         self.assertEqual({'foo': 'bar'}.pop.__qualname__, 'dict.pop')
 
 
-def test_main():
-    support.run_unittest(FunctionPropertiesTest, InstancemethodAttrTest,
-                              ArbitraryFunctionAttrTest, FunctionDictsTest,
-                              FunctionDocstringTest, CellTest,
-                              StaticMethodAttrsTest,
-                              BuiltinFunctionPropertiesTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_functools.py
--- a/Lib/test/test_functools.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_functools.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1546,32 +1546,5 @@
         functools.WeakKeyDictionary = _orig_wkd
 
 
-def test_main(verbose=None):
-    test_classes = (
-        TestPartialC,
-        TestPartialPy,
-        TestPartialCSubclass,
-        TestPartialMethod,
-        TestUpdateWrapper,
-        TestTotalOrdering,
-        TestCmpToKeyC,
-        TestCmpToKeyPy,
-        TestWraps,
-        TestReduce,
-        TestLRU,
-        TestSingleDispatch,
-    )
-    support.run_unittest(*test_classes)
-
-    # verify reference counting
-    if verbose and hasattr(sys, "gettotalrefcount"):
-        import gc
-        counts = [None] * 5
-        for i in range(len(counts)):
-            support.run_unittest(*test_classes)
-            gc.collect()
-            counts[i] = sys.gettotalrefcount()
-        print(counts)
-
 if __name__ == '__main__':
-    test_main(verbose=True)
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_getopt.py
--- a/Lib/test/test_getopt.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_getopt.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,7 @@
 # test_getopt.py
 # David Goodger <dgoodger@bigfoot.com> 2000-08-19
 
-from test.support import verbose, run_doctest, run_unittest, EnvironmentVarGuard
+from test.support import verbose, run_doctest, EnvironmentVarGuard
 import unittest
 
 import getopt
@@ -180,8 +180,5 @@
         self.assertEqual(longopts, [('--help', 'x')])
         self.assertRaises(getopt.GetoptError, getopt.getopt, ['--help='], '', ['help'])
 
-def test_main():
-    run_unittest(GetoptTests)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_grammar.py
--- a/Lib/test/test_grammar.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_grammar.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,7 @@
 # Python test set -- part 1, grammar.
 # This just tests whether the parser accepts them all.
 
-from test.support import run_unittest, check_syntax_error
+from test.support import check_syntax_error
 import unittest
 import sys
 # testing import *
@@ -992,8 +992,5 @@
         self.assertFalse(False is 2 is 3)
 
 
-def test_main():
-    run_unittest(TokenTests, GrammarTests)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_grp.py
--- a/Lib/test/test_grp.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_grp.py	Fri Jun 13 08:19:38 2014 -0500
@@ -92,8 +92,5 @@
 
         self.assertRaises(KeyError, grp.getgrgid, fakegid)
 
-def test_main():
-    support.run_unittest(GroupDatabaseTestCase)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_hmac.py
--- a/Lib/test/test_hmac.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_hmac.py	Fri Jun 13 08:19:38 2014 -0500
@@ -493,14 +493,5 @@
         self.assertFalse(hmac.compare_digest(a, b))
 
 
-def test_main():
-    support.run_unittest(
-        TestVectorsTestCase,
-        ConstructorTestCase,
-        SanityTestCase,
-        CopyTestCase,
-        CompareDigestTestCase
-    )
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_html.py
--- a/Lib/test/test_html.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_html.py	Fri Jun 13 08:19:38 2014 -0500
@@ -4,7 +4,6 @@
 
 import html
 import unittest
-from test.support import run_unittest
 
 
 class HtmlTests(unittest.TestCase):
diff -r 48126f225f10 Lib/test/test_int.py
--- a/Lib/test/test_int.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_int.py	Fri Jun 13 08:19:38 2014 -0500
@@ -451,8 +451,5 @@
         check('123\ud800')
         check('123\ud800', 10)
 
-def test_main():
-    support.run_unittest(IntTestCases)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_int_literal.py
--- a/Lib/test/test_int_literal.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_int_literal.py	Fri Jun 13 08:19:38 2014 -0500
@@ -4,7 +4,6 @@
 """
 
 import unittest
-from test import support
 
 class TestHexOctBin(unittest.TestCase):
 
@@ -140,8 +139,5 @@
         self.assertEqual(-0b1000000000000000000000000000000000000000000000000000000000000000, -9223372036854775808)
         self.assertEqual(-0b1111111111111111111111111111111111111111111111111111111111111111, -18446744073709551615)
 
-def test_main():
-    support.run_unittest(TestHexOctBin)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_ioctl.py
--- a/Lib/test/test_ioctl.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_ioctl.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,6 +1,6 @@
 import array
 import unittest
-from test.support import run_unittest, import_module, get_attribute
+from test.support import import_module, get_attribute
 import os, struct
 fcntl = import_module('fcntl')
 termios = import_module('termios')
diff -r 48126f225f10 Lib/test/test_isinstance.py
--- a/Lib/test/test_isinstance.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_isinstance.py	Fri Jun 13 08:19:38 2014 -0500
@@ -3,7 +3,6 @@
 # testing of error conditions uncovered when using extension types.
 
 import unittest
-from test import support
 import sys
 
 
@@ -277,13 +276,5 @@
         fxn(arg, tuple_arg)
 
 
-def test_main():
-    support.run_unittest(
-        TestIsInstanceExceptions,
-        TestIsSubclassExceptions,
-        TestIsInstanceIsSubclass
-    )
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_keywordonlyarg.py
--- a/Lib/test/test_keywordonlyarg.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_keywordonlyarg.py	Fri Jun 13 08:19:38 2014 -0500
@@ -4,7 +4,6 @@
 __email__ = "seojiwon at gmail dot com"
 
 import unittest
-from test.support import run_unittest
 
 def posonly_sum(pos_arg1, *arg, **kwarg):
     return pos_arg1 + sum(arg) + sum(kwarg.values())
@@ -186,8 +185,5 @@
         self.assertEqual(str(err.exception), "name 'b' is not defined")
 
 
-def test_main():
-    run_unittest(KeywordOnlyArgTestCase)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_kqueue.py
--- a/Lib/test/test_kqueue.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_kqueue.py	Fri Jun 13 08:19:38 2014 -0500
@@ -9,7 +9,6 @@
 import time
 import unittest
 
-from test import support
 if not hasattr(select, "kqueue"):
     raise unittest.SkipTest("test works only on BSD")
 
@@ -212,8 +211,5 @@
         self.assertEqual(os.get_inheritable(kqueue.fileno()), False)
 
 
-def test_main():
-    support.run_unittest(TestKQueue)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_list.py
--- a/Lib/test/test_list.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_list.py	Fri Jun 13 08:19:38 2014 -0500
@@ -106,20 +106,5 @@
         with self.assertRaises(TypeError):
             (3,) + L([1,2])
 
-def test_main(verbose=None):
-    support.run_unittest(ListTest)
-
-    # verify reference counting
-    import sys
-    if verbose and hasattr(sys, "gettotalrefcount"):
-        import gc
-        counts = [None] * 5
-        for i in range(len(counts)):
-            support.run_unittest(ListTest)
-            gc.collect()
-            counts[i] = sys.gettotalrefcount()
-        print(counts)
-
-
 if __name__ == "__main__":
-    test_main(verbose=True)
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_long.py
--- a/Lib/test/test_long.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_long.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1243,8 +1243,5 @@
                 self.assertEqual(type(value >> shift), int)
 
 
-def test_main():
-    support.run_unittest(LongTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_longexp.py
--- a/Lib/test/test_longexp.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_longexp.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,5 +1,4 @@
 import unittest
-from test import support
 
 class LongExpText(unittest.TestCase):
     def test_longexp(self):
@@ -7,8 +6,5 @@
         l = eval("[" + "2," * REPS + "]")
         self.assertEqual(len(l), REPS)
 
-def test_main():
-    support.run_unittest(LongExpText)
-
-if __name__=="__main__":
-    test_main()
+if __name__ == "__main__":
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_mailcap.py
--- a/Lib/test/test_mailcap.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_mailcap.py	Fri Jun 13 08:19:38 2014 -0500
@@ -213,9 +213,5 @@
             self.assertEqual(mailcap.findmatch(*c[0], **c[1]), c[2])
 
 
-def test_main():
-    test.support.run_unittest(HelperFunctionTest, GetcapsTest, FindmatchTest)
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_memoryio.py
--- a/Lib/test/test_memoryio.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_memoryio.py	Fri Jun 13 08:19:38 2014 -0500
@@ -775,10 +775,5 @@
             pass
 
 
-def test_main():
-    tests = [PyBytesIOTest, PyStringIOTest, CBytesIOTest, CStringIOTest,
-             PyStringIOPickleTest, CStringIOPickleTest]
-    support.run_unittest(*tests)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_memoryview.py
--- a/Lib/test/test_memoryview.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_memoryview.py	Fri Jun 13 08:19:38 2014 -0500
@@ -471,8 +471,5 @@
     pass
 
 
-def test_main():
-    test.support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_mimetypes.py
--- a/Lib/test/test_mimetypes.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_mimetypes.py	Fri Jun 13 08:19:38 2014 -0500
@@ -101,11 +101,5 @@
         eq(self.db.guess_type("image.jpg"), ("image/jpeg", None))
         eq(self.db.guess_type("image.png"), ("image/png", None))
 
-def test_main():
-    support.run_unittest(MimeTypesTestCase,
-        Win32MimeTypesTestCase
-        )
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_minidom.py
--- a/Lib/test/test_minidom.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_minidom.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,7 @@
 # test for xml.dom.minidom
 
 import pickle
-from test.support import run_unittest, findfile
+from test.support import findfile
 import unittest
 
 import xml.dom.minidom
@@ -1531,8 +1531,5 @@
         num_children_after = len(doc.childNodes)
         self.assertTrue(num_children_after == num_children_before - 1)
 
-def test_main():
-    run_unittest(MinidomTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_module.py
--- a/Lib/test/test_module.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_module.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,7 @@
 # Test the module type
 import unittest
 import weakref
-from test.support import run_unittest, gc_collect
+from test.support import gc_collect
 from test.script_helper import assert_python_ok
 
 import sys
@@ -214,9 +214,5 @@
     # frozen and namespace module reprs are tested in importlib.
 
 
-def test_main():
-    run_unittest(ModuleTests)
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_modulefinder.py
--- a/Lib/test/test_modulefinder.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_modulefinder.py	Fri Jun 13 08:19:38 2014 -0500
@@ -6,7 +6,6 @@
 import unittest
 import tempfile
 
-from test import support
 
 import modulefinder
 
@@ -309,8 +308,5 @@
         self._do_test(bytecode_test)
 
 
-def test_main():
-    support.run_unittest(ModuleFinderTest)
-
 if __name__ == "__main__":
     unittest.main()
diff -r 48126f225f10 Lib/test/test_msilib.py
--- a/Lib/test/test_msilib.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_msilib.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,7 @@
 """ Test suite for the code in msilib """
 import unittest
 import os
-from test.support import run_unittest, import_module
+from test.support import import_module
 msilib = import_module('msilib')
 
 class Test_make_id(unittest.TestCase):
@@ -39,8 +39,5 @@
             msilib.make_id(".s\x82o?*+rt"), "_.s_o___rt")
 
 
-def test_main():
-    run_unittest(__name__)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_nis.py
--- a/Lib/test/test_nis.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_nis.py	Fri Jun 13 08:19:38 2014 -0500
@@ -36,8 +36,5 @@
             if done:
                 break
 
-def test_main():
-    support.run_unittest(NisTests)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_nntplib.py
--- a/Lib/test/test_nntplib.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_nntplib.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1412,11 +1412,5 @@
     def test_ssl_support(self):
         self.assertTrue(hasattr(nntplib, 'NNTP_SSL'))
 
-def test_main():
-    tests = [MiscTests, NNTPv1Tests, NNTPv2Tests, CapsAfterLoginNNTPv2Tests,
-            SendReaderNNTPv2Tests, NetworkedNNTPTests, NetworkedNNTP_SSLTests]
-    support.run_unittest(*tests)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_normalization.py
--- a/Lib/test/test_normalization.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_normalization.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,4 +1,4 @@
-from test.support import run_unittest, open_urlresource
+from test.support import open_urlresource
 import unittest
 
 from http.client import HTTPException
@@ -97,8 +97,5 @@
         normalize('NFC', '\ud55c\uae00')
 
 
-def test_main():
-    run_unittest(NormalizationTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_numeric_tower.py
--- a/Lib/test/test_numeric_tower.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_numeric_tower.py	Fri Jun 13 08:19:38 2014 -0500
@@ -5,7 +5,6 @@
 import math
 import sys
 import operator
-from test.support import run_unittest
 
 from decimal import Decimal as D
 from fractions import Fraction as F
@@ -199,8 +198,5 @@
                 self.assertRaises(TypeError, op, v, z)
 
 
-def test_main():
-    run_unittest(HashTest, ComparisonTest)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_opcodes.py
--- a/Lib/test/test_opcodes.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_opcodes.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,6 +1,5 @@
 # Python test set -- part 2, opcodes
 
-from test.support import run_unittest
 import unittest
 
 class OpcodeTest(unittest.TestCase):
@@ -105,8 +104,5 @@
         self.assertEqual(MyString() % 3, 42)
 
 
-def test_main():
-    run_unittest(OpcodeTest)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_openpty.py
--- a/Lib/test/test_openpty.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_openpty.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,6 @@
 # Test to see if openpty works. (But don't worry if it isn't available.)
 
 import os, unittest
-from test.support import run_unittest
 
 if not hasattr(os, "openpty"):
     raise unittest.SkipTest("os.openpty() not available.")
@@ -18,8 +17,5 @@
         os.write(slave, b'Ping!')
         self.assertEqual(os.read(master, 1024), b'Ping!')
 
-def test_main():
-    run_unittest(OpenptyTest)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_osx_env.py
--- a/Lib/test/test_osx_env.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_osx_env.py	Fri Jun 13 08:19:38 2014 -0500
@@ -2,7 +2,7 @@
 Test suite for OS X interpreter environment variables.
 """
 
-from test.support import EnvironmentVarGuard, run_unittest
+from test.support import EnvironmentVarGuard
 import subprocess
 import sys
 import sysconfig
diff -r 48126f225f10 Lib/test/test_parser.py
--- a/Lib/test/test_parser.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_parser.py	Fri Jun 13 08:19:38 2014 -0500
@@ -730,16 +730,5 @@
         with self.assertRaises(TypeError):
             parser.expr("a", "b")
 
-def test_main():
-    support.run_unittest(
-        RoundtripLegalSyntaxTestCase,
-        IllegalSyntaxTestCase,
-        CompileTestCase,
-        ParserStackLimitTestCase,
-        STObjectTestCase,
-        OtherParserCase,
-    )
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_peepholer.py
--- a/Lib/test/test_peepholer.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_peepholer.py	Fri Jun 13 08:19:38 2014 -0500
@@ -319,21 +319,5 @@
             f()
 
 
-def test_main(verbose=None):
-    import sys
-    from test import support
-    test_classes = (TestTranforms, TestBuglets)
-    support.run_unittest(*test_classes)
-
-    # verify reference counting
-    if verbose and hasattr(sys, 'gettotalrefcount'):
-        import gc
-        counts = [None] * 5
-        for i in range(len(counts)):
-            support.run_unittest(*test_classes)
-            gc.collect()
-            counts[i] = sys.gettotalrefcount()
-        print(counts)
-
 if __name__ == "__main__":
-    test_main(verbose=True)
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pep247.py
--- a/Lib/test/test_pep247.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pep247.py	Fri Jun 13 08:19:38 2014 -0500
@@ -6,7 +6,6 @@
 import hmac
 import unittest
 from hashlib import md5, sha1, sha224, sha256, sha384, sha512
-from test import support
 
 class Pep247Test(unittest.TestCase):
 
@@ -63,8 +62,5 @@
     def test_hmac(self):
         self.check_module(hmac, key=b'abc')
 
-def test_main():
-    support.run_unittest(Pep247Test)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pep292.py
--- a/Lib/test/test_pep292.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pep292.py	Fri Jun 13 08:19:38 2014 -0500
@@ -237,11 +237,5 @@
                          'tim likes to eat a bag of ham worth $100')
 
 
-def test_main():
-    from test import support
-    test_classes = [TestTemplate,]
-    support.run_unittest(*test_classes)
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pep3120.py
--- a/Lib/test/test_pep3120.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pep3120.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,6 @@
 # This file is marked as binary in the CVS, to prevent MacCVS from recoding it.
 
 import unittest
-from test import support
 
 class PEP3120Test(unittest.TestCase):
 
@@ -40,8 +39,5 @@
         self.assertEqual('Ç', ns['u'])
 
 
-def test_main():
-    support.run_unittest(PEP3120Test, BuiltinCompileTests)
-
-if __name__=="__main__":
-    test_main()
+if __name__ == "__main__":
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pep3131.py
--- a/Lib/test/test_pep3131.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pep3131.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,6 +1,5 @@
 import unittest
 import sys
-from test import support
 
 class PEP3131Test(unittest.TestCase):
 
@@ -28,8 +27,5 @@
         else:
             self.fail("expected exception didn't occur")
 
-def test_main():
-    support.run_unittest(PEP3131Test)
-
-if __name__=="__main__":
-    test_main()
+if __name__ == "__main__":
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pep3151.py
--- a/Lib/test/test_pep3151.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pep3151.py	Fri Jun 13 08:19:38 2014 -0500
@@ -7,7 +7,6 @@
 import errno
 from errno import EEXIST
 
-from test import support
 
 class SubOSError(OSError):
     pass
@@ -202,8 +201,5 @@
         self.assertEqual(str(e), '')
 
 
-def test_main():
-    support.run_unittest(__name__)
-
-if __name__=="__main__":
-    test_main()
+if __name__ == "__main__":
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pep380.py
--- a/Lib/test/test_pep380.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pep380.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1013,11 +1013,5 @@
         self.assertEqual(v, (1, 2, 3, 4))
 
 
-def test_main():
-    from test import support
-    test_classes = [TestPEP380Operation]
-    support.run_unittest(*test_classes)
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pkg.py
--- a/Lib/test/test_pkg.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pkg.py	Fri Jun 13 08:19:38 2014 -0500
@@ -291,9 +291,5 @@
         import t8
         self.assertEqual(t8.__doc__, "doc for t8")
 
-def test_main():
-    support.run_unittest(__name__)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pkgimport.py
--- a/Lib/test/test_pkgimport.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pkgimport.py	Fri Jun 13 08:19:38 2014 -0500
@@ -7,7 +7,7 @@
 import unittest
 
 from importlib.util import cache_from_source
-from test.support import run_unittest, create_empty_file
+from test.support import create_empty_file
 
 class TestImport(unittest.TestCase):
 
@@ -76,9 +76,5 @@
         self.assertEqual(getattr(module, var), 1)
 
 
-def test_main():
-    run_unittest(TestImport)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_popen.py
--- a/Lib/test/test_popen.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_popen.py	Fri Jun 13 08:19:38 2014 -0500
@@ -57,8 +57,5 @@
         with os.popen("echo hello") as f:
             self.assertEqual(list(f), ["hello\n"])
 
-def test_main():
-    support.run_unittest(PopenTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pow.py
--- a/Lib/test/test_pow.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pow.py	Fri Jun 13 08:19:38 2014 -0500
@@ -122,8 +122,5 @@
             eq(pow(a, -fiveto), expected)
         eq(expected, 1.0)   # else we didn't push fiveto to evenness
 
-def test_main():
-    test.support.run_unittest(PowTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_property.py
--- a/Lib/test/test_property.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_property.py	Fri Jun 13 08:19:38 2014 -0500
@@ -3,7 +3,6 @@
 
 import sys
 import unittest
-from test.support import run_unittest
 
 class PropertyBase(Exception):
     pass
@@ -247,8 +246,5 @@
 
 
 
-def test_main():
-    run_unittest(PropertyTests, PropertySubclassTests)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pstats.py
--- a/Lib/test/test_pstats.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pstats.py	Fri Jun 13 08:19:38 2014 -0500
@@ -34,12 +34,5 @@
         stats.add(self.stats, self.stats)
 
 
-def test_main():
-    support.run_unittest(
-        AddCallersTestCase,
-        StatsTestCase,
-    )
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pty.py
--- a/Lib/test/test_pty.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pty.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,4 +1,4 @@
-from test.support import verbose, run_unittest, import_module, reap_children
+from test.support import verbose, import_module, reap_children
 
 #Skip these tests if either fcntl or termios is not available
 fcntl = import_module('fcntl')
@@ -292,11 +292,8 @@
             pty._copy(masters[0])
 
 
-def test_main(verbose=None):
-    try:
-        run_unittest(SmallPtyTests, PtyTest)
-    finally:
-        reap_children()
+def tearDownModule():
+    reap_children()
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pulldom.py
--- a/Lib/test/test_pulldom.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pulldom.py	Fri Jun 13 08:19:38 2014 -0500
@@ -6,7 +6,7 @@
 from xml.sax.xmlreader import AttributesImpl
 from xml.dom import pulldom
 
-from test.support import run_unittest, findfile
+from test.support import findfile
 
 
 tstfile = findfile("test.xml", subdir="xmltestdata")
@@ -339,9 +339,5 @@
         doc.unlink()
 
 
-def test_main():
-    run_unittest(PullDOMTestCase, ThoroughTestCase, SAX2DOMTestCase)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pwd.py
--- a/Lib/test/test_pwd.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pwd.py	Fri Jun 13 08:19:38 2014 -0500
@@ -107,8 +107,5 @@
         self.assertRaises(KeyError, pwd.getpwuid, 2**128)
         self.assertRaises(KeyError, pwd.getpwuid, -2**128)
 
-def test_main():
-    support.run_unittest(PwdTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pyclbr.py
--- a/Lib/test/test_pyclbr.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pyclbr.py	Fri Jun 13 08:19:38 2014 -0500
@@ -2,7 +2,6 @@
    Test cases for pyclbr.py
    Nick Mathewson
 '''
-from test.support import run_unittest
 import sys
 from types import FunctionType, MethodType, BuiltinFunctionType
 import pyclbr
@@ -173,9 +172,5 @@
         self.assertRaises(ImportError, pyclbr.readmodule_ex, 'asyncore.foo')
 
 
-def test_main():
-    run_unittest(PyclbrTest)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_pyexpat.py
--- a/Lib/test/test_pyexpat.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_pyexpat.py	Fri Jun 13 08:19:38 2014 -0500
@@ -7,7 +7,7 @@
 from xml.parsers import expat
 from xml.parsers.expat import errors
 
-from test.support import sortdict, run_unittest
+from test.support import sortdict
 
 
 class SetAttributeTest(unittest.TestCase):
@@ -690,19 +690,5 @@
         self.assertEqual(handler_call_args, [("bar", "baz")])
 
 
-def test_main():
-    run_unittest(SetAttributeTest,
-                 ParseTest,
-                 NamespaceSeparatorTest,
-                 InterningTest,
-                 BufferTextTest,
-                 HandlerExceptionTest,
-                 PositionTest,
-                 sf1296433Test,
-                 ChardataBufferTest,
-                 MalformedInputTest,
-                 ErrorMessageTest,
-                 ForeignDTDTests)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_queue.py
--- a/Lib/test/test_queue.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_queue.py	Fri Jun 13 08:19:38 2014 -0500
@@ -354,10 +354,5 @@
         self.failing_queue_test(q)
 
 
-def test_main():
-    support.run_unittest(QueueTest, LifoQueueTest, PriorityQueueTest,
-                              FailingQueueTest)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_quopri.py
--- a/Lib/test/test_quopri.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_quopri.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,4 +1,3 @@
-from test import support
 import unittest
 
 import sys, os, io, subprocess
@@ -200,9 +199,5 @@
         p = p.decode('latin-1')
         self.assertEqual(cout.splitlines(), p.splitlines())
 
-def test_main():
-    support.run_unittest(QuopriTestCase)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_raise.py
--- a/Lib/test/test_raise.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_raise.py	Fri Jun 13 08:19:38 2014 -0500
@@ -415,8 +415,5 @@
             self.fail("No exception raised")
 
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
     unittest.main()
diff -r 48126f225f10 Lib/test/test_range.py
--- a/Lib/test/test_range.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_range.py	Fri Jun 13 08:19:38 2014 -0500
@@ -645,8 +645,5 @@
         with self.assertRaises(AttributeError):
             del rangeobj.step
 
-def test_main():
-    test.support.run_unittest(RangeTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_readline.py
--- a/Lib/test/test_readline.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_readline.py	Fri Jun 13 08:19:38 2014 -0500
@@ -6,7 +6,7 @@
 why the tests cover only a small subset of the interface.
 """
 import unittest
-from test.support import run_unittest, import_module
+from test.support import import_module
 
 # Skip tests if there is no readline module
 readline = import_module('readline')
@@ -40,8 +40,5 @@
         self.assertEqual(readline.get_current_history_length(), 1)
 
 
-def test_main():
-    run_unittest(TestHistoryManipulation)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_reprlib.py
--- a/Lib/test/test_reprlib.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_reprlib.py	Fri Jun 13 08:19:38 2014 -0500
@@ -10,7 +10,7 @@
 import importlib.util
 import unittest
 
-from test.support import run_unittest, create_empty_file, verbose
+from test.support import create_empty_file, verbose
 from reprlib import repr as r # Don't shadow builtin repr
 from reprlib import Repr
 from reprlib import recursive_repr
@@ -373,11 +373,5 @@
         m.append(m)
         self.assertEqual(repr(m), '<a, b, c, d, e, +++, x, +++>')
 
-def test_main():
-    run_unittest(ReprTests)
-    run_unittest(LongReprTest)
-    run_unittest(TestRecursiveRepr)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_richcmp.py
--- a/Lib/test/test_richcmp.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_richcmp.py	Fri Jun 13 08:19:38 2014 -0500
@@ -326,8 +326,5 @@
             self.assertIs(op(x, y), True)
 
 
-def test_main():
-    support.run_unittest(VectorTest, NumberTest, MiscTest, DictTest, ListTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_rlcompleter.py
--- a/Lib/test/test_rlcompleter.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_rlcompleter.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,4 +1,3 @@
-from test import support
 import unittest
 import builtins
 import rlcompleter
@@ -65,9 +64,5 @@
                          ['egg.{}('.format(x) for x in dir(str)
                           if x.startswith('s')])
 
-def test_main():
-    support.run_unittest(TestRlcompleter)
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_runpy.py
--- a/Lib/test/test_runpy.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_runpy.py	Fri Jun 13 08:19:38 2014 -0500
@@ -8,7 +8,7 @@
 import importlib, importlib.machinery, importlib.util
 import py_compile
 from test.support import (
-    forget, make_legacy_pyc, run_unittest, unload, verbose, no_tracing,
+    forget, make_legacy_pyc, unload, verbose, no_tracing,
     create_empty_file)
 from test.script_helper import (
     make_pkg, make_script, make_zip_pkg, make_zip_script, temp_dir)
diff -r 48126f225f10 Lib/test/test_scope.py
--- a/Lib/test/test_scope.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_scope.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,7 @@
 import unittest
 import weakref
 
-from test.support import check_syntax_error, cpython_only, run_unittest
+from test.support import check_syntax_error, cpython_only
 
 
 class ScopeTests(unittest.TestCase):
@@ -757,8 +757,5 @@
         self.assertIsNone(ref())
 
 
-def test_main():
-    run_unittest(ScopeTests)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_select.py
--- a/Lib/test/test_select.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_select.py	Fri Jun 13 08:19:38 2014 -0500
@@ -75,9 +75,8 @@
         a[:] = [F()] * 10
         self.assertEqual(select.select([], a, []), ([], a[:5], []))
 
-def test_main():
-    support.run_unittest(SelectTestCase)
+def tearDownModule():
     support.reap_children()
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_shlex.py
--- a/Lib/test/test_shlex.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_shlex.py	Fri Jun 13 08:19:38 2014 -0500
@@ -3,7 +3,6 @@
 import string
 import unittest
 
-from test import support
 
 
 # The original test data set was from shellwords, by Hartmut Goebel.
@@ -195,8 +194,5 @@
         if methname.startswith("test") and methname != "testCompat":
             delattr(ShlexTest, methname)
 
-def test_main():
-    support.run_unittest(ShlexTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_signal.py
--- a/Lib/test/test_signal.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_signal.py	Fri Jun 13 08:19:38 2014 -0500
@@ -926,15 +926,8 @@
                                 (exitcode, stdout))
 
 
-def test_main():
-    try:
-        support.run_unittest(PosixTests, InterProcessSignalTests,
-                             WakeupFDTests, WakeupSignalTests,
-                             SiginterruptTest, ItimerTest, WindowsSignalTests,
-                             PendingSignalsTests)
-    finally:
-        support.reap_children()
-
+def tearDownModule():
+    support.reap_children()
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_slice.py
--- a/Lib/test/test_slice.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_slice.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,6 @@
 # tests for slice objects; in particular the indices method.
 
 import unittest
-from test import support
 from pickle import loads, dumps
 
 import itertools
@@ -240,8 +239,5 @@
             self.assertEqual(s.indices(15), t.indices(15))
             self.assertNotEqual(id(s), id(t))
 
-def test_main():
-    support.run_unittest(SliceTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_smtpnet.py
--- a/Lib/test/test_smtpnet.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_smtpnet.py	Fri Jun 13 08:19:38 2014 -0500
@@ -76,8 +76,5 @@
             server.quit()
 
 
-def test_main():
-    support.run_unittest(SmtpTest, SmtpSSLTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_sort.py
--- a/Lib/test/test_sort.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_sort.py	Fri Jun 13 08:19:38 2014 -0500
@@ -262,24 +262,5 @@
 
 #==============================================================================
 
-def test_main(verbose=None):
-    test_classes = (
-        TestBase,
-        TestDecorateSortUndecorate,
-        TestBugs,
-    )
-
-    support.run_unittest(*test_classes)
-
-    # verify reference counting
-    if verbose and hasattr(sys, "gettotalrefcount"):
-        import gc
-        counts = [None] * 5
-        for i in range(len(counts)):
-            support.run_unittest(*test_classes)
-            gc.collect()
-            counts[i] = sys.gettotalrefcount()
-        print(counts)
-
 if __name__ == "__main__":
-    test_main(verbose=True)
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_startfile.py
--- a/Lib/test/test_startfile.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_startfile.py	Fri Jun 13 08:19:38 2014 -0500
@@ -30,8 +30,5 @@
             startfile(empty)
             startfile(empty, "open")
 
-def test_main():
-    support.run_unittest(TestCase)
-
-if __name__=="__main__":
-    test_main()
+if __name__ == "__main__":
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_string.py
--- a/Lib/test/test_string.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_string.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,5 +1,4 @@
 import unittest, string
-from test import support
 
 
 class ModuleTest(unittest.TestCase):
@@ -167,8 +166,5 @@
         self.assertIn("recursion", str(err.exception))
 
 
-def test_main():
-    support.run_unittest(ModuleTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_stringprep.py
--- a/Lib/test/test_stringprep.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_stringprep.py	Fri Jun 13 08:19:38 2014 -0500
@@ -2,7 +2,6 @@
 # Since we don't have them, this test checks only a few codepoints.
 
 import unittest
-from test import support
 
 from stringprep import *
 
@@ -89,8 +88,5 @@
         #     h.update(data)
         #     print p, h.hexdigest()
 
-def test_main():
-    support.run_unittest(StringprepTests)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_strlit.py
--- a/Lib/test/test_strlit.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_strlit.py	Fri Jun 13 08:19:38 2014 -0500
@@ -32,7 +32,6 @@
 import shutil
 import tempfile
 import unittest
-import test.support
 
 
 TEMPLATE = r"""# coding: %s
@@ -199,8 +198,5 @@
         self.check_encoding("latin9")
 
 
-def test_main():
-    test.support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_strptime.py
--- a/Lib/test/test_strptime.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_strptime.py	Fri Jun 13 08:19:38 2014 -0500
@@ -560,18 +560,5 @@
             locale.setlocale(locale.LC_TIME, locale_info)
 
 
-def test_main():
-    support.run_unittest(
-        getlang_Tests,
-        LocaleTime_Tests,
-        TimeRETests,
-        StrptimeTests,
-        Strptime12AMPMTests,
-        JulianTests,
-        CalculationTests,
-        CacheTests
-    )
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_strtod.py
--- a/Lib/test/test_strtod.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_strtod.py	Fri Jun 13 08:19:38 2014 -0500
@@ -429,8 +429,5 @@
         for s in test_strings:
             self.check_strtod(s)
 
-def test_main():
-    test.support.run_unittest(StrtodTests)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_struct.py
--- a/Lib/test/test_struct.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_struct.py	Fri Jun 13 08:19:38 2014 -0500
@@ -660,8 +660,5 @@
         self.assertRaises(StopIteration, next, it)
 
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_structmembers.py
--- a/Lib/test/test_structmembers.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_structmembers.py	Fri Jun 13 08:19:38 2014 -0500
@@ -140,8 +140,5 @@
             ts.T_USHORT = USHRT_MAX+1
 
 
-def test_main(verbose=None):
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main(verbose=True)
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_structseq.py
--- a/Lib/test/test_structseq.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_structseq.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,6 @@
 import os
 import time
 import unittest
-from test import support
 
 
 class StructSeqTest(unittest.TestCase):
@@ -123,8 +122,5 @@
                     self.assertEqual(list(t[start:stop:step]),
                                      L[start:stop:step])
 
-def test_main():
-    support.run_unittest(StructSeqTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_super.py
--- a/Lib/test/test_super.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_super.py	Fri Jun 13 08:19:38 2014 -0500
@@ -2,7 +2,6 @@
 
 import sys
 import unittest
-from test import support
 
 
 class A:
@@ -173,9 +172,5 @@
         self.assertRaises(TypeError, X.meth, c)
 
 
-def test_main():
-    support.run_unittest(TestSuper)
-
-
 if __name__ == "__main__":
     unittest.main()
diff -r 48126f225f10 Lib/test/test_symtable.py
--- a/Lib/test/test_symtable.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_symtable.py	Fri Jun 13 08:19:38 2014 -0500
@@ -4,7 +4,6 @@
 import symtable
 import unittest
 
-from test import support
 
 
 TEST_CODE = """
@@ -169,8 +168,5 @@
         symbols = symtable.symtable("def f(x): return x", "?", "exec")
 
 
-def test_main():
-    support.run_unittest(SymtableTest)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_sys_setprofile.py
--- a/Lib/test/test_sys_setprofile.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_sys_setprofile.py	Fri Jun 13 08:19:38 2014 -0500
@@ -3,7 +3,6 @@
 import sys
 import unittest
 
-from test import support
 
 class TestGetProfile(unittest.TestCase):
     def setUp(self):
@@ -374,13 +373,5 @@
     pprint.pprint(capture_events(callable))
 
 
-def test_main():
-    support.run_unittest(
-        TestGetProfile,
-        ProfileHookTestCase,
-        ProfileSimulatorTestCase
-    )
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_syslog.py
--- a/Lib/test/test_syslog.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_syslog.py	Fri Jun 13 08:19:38 2014 -0500
@@ -36,8 +36,5 @@
         syslog.openlog()
         syslog.syslog('test message from python test_syslog')
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_telnetlib.py
--- a/Lib/test/test_telnetlib.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_telnetlib.py	Fri Jun 13 08:19:38 2014 -0500
@@ -393,9 +393,5 @@
         self.assertEqual(data, b''.join(want[:-1]))
 
 
-def test_main(verbose=None):
-    support.run_unittest(GeneralTests, ReadTests, WriteTests, OptionTests,
-                         ExpectTests)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_tempfile.py
--- a/Lib/test/test_tempfile.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_tempfile.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1237,8 +1237,5 @@
         self.assertFalse(os.path.exists(name))
 
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_thread.py
--- a/Lib/test/test_thread.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_thread.py	Fri Jun 13 08:19:38 2014 -0500
@@ -252,9 +252,5 @@
             pass
 
 
-def test_main():
-    support.run_unittest(ThreadRunningTests, BarrierTest, LockTests,
-                         TestForkInThread)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_threadedtempfile.py
--- a/Lib/test/test_threadedtempfile.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_threadedtempfile.py	Fri Jun 13 08:19:38 2014 -0500
@@ -18,7 +18,7 @@
 
 import tempfile
 
-from test.support import threading_setup, threading_cleanup, run_unittest, import_module
+from test.support import threading_setup, threading_cleanup, import_module
 threading = import_module('threading')
 import unittest
 import io
@@ -71,8 +71,5 @@
         self.assertEqual(errors, [], msg)
         self.assertEqual(ok, NUM_THREADS * FILES_PER_THREAD)
 
-def test_main():
-    run_unittest(ThreadedTempFileTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_timeit.py
--- a/Lib/test/test_timeit.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_timeit.py	Fri Jun 13 08:19:38 2014 -0500
@@ -5,7 +5,6 @@
 import time
 from textwrap import dedent
 
-from test.support import run_unittest
 from test.support import captured_stdout
 from test.support import captured_stderr
 
@@ -299,8 +298,5 @@
         self.assert_exc_string(error_stringio.getvalue(), 'ZeroDivisionError')
 
 
-def test_main():
-    run_unittest(TestTimeit)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_tools.py
--- a/Lib/test/test_tools.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_tools.py	Fri Jun 13 08:19:38 2014 -0500
@@ -456,10 +456,5 @@
     from test_unparse import DirectoryTestCase
 
 
-def test_main():
-    support.run_unittest(*[obj for obj in globals().values()
-                               if isinstance(obj, type)])
-
-
 if __name__ == '__main__':
     unittest.main()
diff -r 48126f225f10 Lib/test/test_tuple.py
--- a/Lib/test/test_tuple.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_tuple.py	Fri Jun 13 08:19:38 2014 -0500
@@ -201,8 +201,5 @@
         with self.assertRaises(TypeError):
             [3,] + T((1,2))
 
-def test_main():
-    support.run_unittest(TupleTest)
-
-if __name__=="__main__":
-    test_main()
+if __name__ == "__main__":
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_typechecks.py
--- a/Lib/test/test_typechecks.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_typechecks.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,6 @@
 """Unit tests for __instancecheck__ and __subclasscheck__."""
 
 import unittest
-from test import support
 
 
 class ABC(type):
@@ -68,9 +67,5 @@
         self.assertEqual(isinstance(42, (SubInt,)), False)
 
 
-def test_main():
-    support.run_unittest(TypeChecksTest)
-
-
 if __name__ == "__main__":
     unittest.main()
diff -r 48126f225f10 Lib/test/test_types.py
--- a/Lib/test/test_types.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_types.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,6 +1,6 @@
 # Python test set -- part 6, built-in types
 
-from test.support import run_unittest, run_with_locale
+from test.support import run_with_locale
 import collections
 import pickle
 import locale
@@ -1170,9 +1170,5 @@
             self.assertEqual(ns, ns_roundtrip, pname)
 
 
-def test_main():
-    run_unittest(TypesTests, MappingProxyTests, ClassCreationTests,
-                 SimpleNamespaceTests)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_ucn.py
--- a/Lib/test/test_ucn.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_ucn.py	Fri Jun 13 08:19:38 2014 -0500
@@ -233,8 +233,5 @@
         )
 
 
-def test_main():
-    support.run_unittest(UnicodeNamesTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_unary.py
--- a/Lib/test/test_unary.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_unary.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,7 +1,6 @@
 """Test compiler changes for unary ops (+, -, ~) introduced in Python 2.2"""
 
 import unittest
-from test.support import run_unittest
 
 class UnaryOpTestCase(unittest.TestCase):
 
@@ -50,9 +49,5 @@
         self.assertRaises(TypeError, eval, "~2.0")
 
 
-def test_main():
-    run_unittest(UnaryOpTestCase)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_unicodedata.py
--- a/Lib/test/test_unicodedata.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_unicodedata.py	Fri Jun 13 08:19:38 2014 -0500
@@ -312,12 +312,5 @@
                 self.assertEqual(len(lines), 1,
                                  r"\u%.4x should not be a linebreak" % i)
 
-def test_main():
-    test.support.run_unittest(
-        UnicodeMiscTest,
-        UnicodeMethodsTest,
-        UnicodeFunctionsTest
-    )
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_urlparse.py
--- a/Lib/test/test_urlparse.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_urlparse.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,4 +1,3 @@
-from test import support
 import unittest
 import urllib.parse
 
@@ -872,8 +871,5 @@
         self.assertIn('Quoter', repr(quoter))
 
 
-def test_main():
-    support.run_unittest(UrlParseTestCase)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_userdict.py
--- a/Lib/test/test_userdict.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_userdict.py	Fri Jun 13 08:19:38 2014 -0500
@@ -190,10 +190,5 @@
 
 
 
-def test_main():
-    support.run_unittest(
-        UserDictTest,
-    )
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_userlist.py
--- a/Lib/test/test_userlist.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_userlist.py	Fri Jun 13 08:19:38 2014 -0500
@@ -58,8 +58,5 @@
         self.assertEqual(u, v)
         self.assertEqual(type(u), type(v))
 
-def test_main():
-    support.run_unittest(UserListTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_venv.py
--- a/Lib/test/test_venv.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_venv.py	Fri Jun 13 08:19:38 2014 -0500
@@ -13,7 +13,7 @@
 import subprocess
 import sys
 import tempfile
-from test.support import (captured_stdout, captured_stderr, run_unittest,
+from test.support import (captured_stdout, captured_stderr,
                           can_symlink, EnvironmentVarGuard)
 import textwrap
 import unittest
@@ -399,8 +399,5 @@
         self.assert_pip_not_installed()
 
 
-def test_main():
-    run_unittest(BasicTest, EnsurePipTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_wait3.py
--- a/Lib/test/test_wait3.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_wait3.py	Fri Jun 13 08:19:38 2014 -0500
@@ -5,7 +5,7 @@
 import time
 import unittest
 from test.fork_wait import ForkWait
-from test.support import run_unittest, reap_children
+from test.support import reap_children
 
 if not hasattr(os, 'fork'):
     raise unittest.SkipTest("os.fork not defined")
@@ -30,9 +30,8 @@
         self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
         self.assertTrue(rusage)
 
-def test_main():
-    run_unittest(Wait3Test)
+def tearDownModule():
     reap_children()
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_wait4.py
--- a/Lib/test/test_wait4.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_wait4.py	Fri Jun 13 08:19:38 2014 -0500
@@ -5,7 +5,7 @@
 import time
 import sys
 from test.fork_wait import ForkWait
-from test.support import run_unittest, reap_children, get_attribute
+from test.support import reap_children, get_attribute
 
 # If either of these do not exist, skip this test.
 get_attribute(os, 'fork')
@@ -30,9 +30,8 @@
         self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
         self.assertTrue(rusage)
 
-def test_main():
-    run_unittest(Wait4Test)
+def tearDownModule():
     reap_children()
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_weakset.py
--- a/Lib/test/test_weakset.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_weakset.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,5 +1,4 @@
 import unittest
-from test import support
 from weakref import proxy, ref, WeakSet
 import operator
 import copy
@@ -443,8 +442,5 @@
             self.assertLessEqual(n2, n1)
 
 
-def test_main(verbose=None):
-    support.run_unittest(TestWeakSet)
-
 if __name__ == "__main__":
-    test_main(verbose=True)
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_winsound.py
--- a/Lib/test/test_winsound.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_winsound.py	Fri Jun 13 08:19:38 2014 -0500
@@ -246,8 +246,5 @@
     return __have_soundcard_cache
 
 
-def test_main():
-    support.run_unittest(BeepTest, MessageBeepTest, PlaySoundTest)
-
-if __name__=="__main__":
-    test_main()
+if __name__ == "__main__":
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_with.py
--- a/Lib/test/test_with.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_with.py	Fri Jun 13 08:19:38 2014 -0500
@@ -8,7 +8,6 @@
 import unittest
 from collections import deque
 from contextlib import _GeneratorContextManager, contextmanager
-from test.support import run_unittest
 
 
 class MockContextManager(_GeneratorContextManager):
@@ -737,14 +736,5 @@
             self.assertEqual(10, b1)
             self.assertEqual(20, b2)
 
-def test_main():
-    run_unittest(FailureTestCase, NonexceptionalTestCase,
-                 NestedNonexceptionalTestCase, ExceptionalTestCase,
-                 NonLocalFlowControlTestCase,
-                 AssignmentTargetTestCase,
-                 ExitSwallowsExceptionTestCase,
-                 NestedWith)
-
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_wsgiref.py
--- a/Lib/test/test_wsgiref.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_wsgiref.py	Fri Jun 13 08:19:38 2014 -0500
@@ -628,8 +628,5 @@
         self.assertEqual(side_effects['close_called'], True)
 
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_xdrlib.py
--- a/Lib/test/test_xdrlib.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_xdrlib.py	Fri Jun 13 08:19:38 2014 -0500
@@ -1,4 +1,3 @@
-from test import support
 import unittest
 
 import xdrlib
@@ -51,8 +50,5 @@
         up.done()
         self.assertRaises(EOFError, up.unpack_uint)
 
-def test_main():
-    support.run_unittest(XDRTest)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_zipimport_support.py
--- a/Lib/test/test_zipimport_support.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_zipimport_support.py	Fri Jun 13 08:19:38 2014 -0500
@@ -238,9 +238,8 @@
             self.assertIn(os.path.normcase(run_name.encode('utf-8')), data)
 
 
-def test_main():
-    test.support.run_unittest(ZipSupportTests)
+def tearDownModule():
     test.support.reap_children()
 
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff -r 48126f225f10 Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py	Fri Jun 13 14:58:48 2014 +0200
+++ b/Lib/test/test_zlib.py	Fri Jun 13 08:19:38 2014 -0500
@@ -710,16 +710,5 @@
 """
 
 
-def test_main():
-    support.run_unittest(
-        VersionTestCase,
-        ChecksumTestCase,
-        ChecksumBigBufferTestCase,
-        ExceptionTestCase,
-        CompressTestCase,
-        CompressObjectTestCase
-    )
-
 if __name__ == "__main__":
-    unittest.main() # XXX
-    ###test_main()
+    unittest.main()