diff -r 26d0a17affb5 Lib/test/test_os.py
--- a/Lib/test/test_os.py	Fri Oct 31 16:48:41 2014 -0700
+++ b/Lib/test/test_os.py	Fri Oct 31 20:51:35 2014 -0500
@@ -2600,7 +2600,6 @@
         self.assertEqual(os.get_inheritable(master_fd), False)
         self.assertEqual(os.get_inheritable(slave_fd), False)
 
-
 @unittest.skipUnless(hasattr(os, 'get_blocking'),
                      'needs os.get_blocking() and os.set_blocking()')
 class BlockingTests(unittest.TestCase):
@@ -2615,52 +2614,10 @@
         os.set_blocking(fd, True)
         self.assertEqual(os.get_blocking(fd), True)
 
-
-
 class ExportsTests(unittest.TestCase):
     def test_os_all(self):
         self.assertIn('open', os.__all__)
         self.assertIn('walk', os.__all__)
 
-
-@support.reap_threads
-def test_main():
-    support.run_unittest(
-        FileTests,
-        StatAttributeTests,
-        EnvironTests,
-        WalkTests,
-        FwalkTests,
-        MakedirTests,
-        DevNullTests,
-        URandomTests,
-        ExecTests,
-        Win32ErrorTests,
-        TestInvalidFD,
-        PosixUidGidTests,
-        Pep383Tests,
-        Win32KillTests,
-        Win32ListdirTests,
-        Win32SymlinkTests,
-        NonLocalSymlinkTests,
-        FSEncodingTests,
-        DeviceEncodingTests,
-        PidTests,
-        LoginTests,
-        LinkTests,
-        TestSendfile,
-        ProgramPriorityTests,
-        ExtendedAttributeTests,
-        Win32DeprecatedBytesAPI,
-        TermsizeTests,
-        OSErrorTests,
-        RemoveDirsTests,
-        CPUCountTests,
-        FDInheritanceTests,
-        Win32JunctionTests,
-        BlockingTests,
-        ExportsTests,
-    )
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()