diff -r b79025925eab Lib/test/test_univnewlines.py
--- a/Lib/test/test_univnewlines.py	Wed Apr 03 13:49:36 2013 +0100
+++ b/Lib/test/test_univnewlines.py	Wed Apr 10 14:15:50 2013 -0500
@@ -106,7 +106,7 @@
     DATA = DATA_MIXED
 
 
-def test_main():
+def load_tests(*args):
     base_tests = (TestCRNewlines,
                   TestLFNewlines,
                   TestCRLFNewlines,
@@ -122,7 +122,8 @@
         PyTest.__name__ = "Py" + test.__name__
         tests.append(CTest)
         tests.append(PyTest)
-    support.run_unittest(*tests)
+
+    return unittest.TestSuite([unittest.makeSuite(test) for test in tests])
 
 if __name__ == '__main__':
-    test_main()
+    unittest.main()