diff -r 0842c5411ed6 Lib/test/test_io.py --- a/Lib/test/test_io.py Mon Mar 18 09:59:15 2013 +0100 +++ b/Lib/test/test_io.py Mon Mar 18 12:23:17 2013 -0500 @@ -3234,7 +3234,7 @@ test_reentrant_write_text = None -def test_main(): +def load_tests(*args): tests = (CIOTest, PyIOTest, CBufferedReaderTest, PyBufferedReaderTest, CBufferedWriterTest, PyBufferedWriterTest, @@ -3267,7 +3267,8 @@ for name, obj in py_io_ns.items(): setattr(test, name, obj) - support.run_unittest(*tests) + suite = unittest.TestSuite([unittest.makeSuite(test) for test in tests]) + return suite if __name__ == "__main__": - test_main() + unittest.main()