Merge test_htmlparser changes from 3.3.
diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py
index 6ebf5b8..57a0b95 100644
--- a/Lib/test/test_htmlparser.py
+++ b/Lib/test/test_htmlparser.py
@@ -764,11 +764,5 @@
                          ("data", "spam"), ("endtag", "a")])
 
 
-
-def test_main():
-    support.run_unittest(HTMLParserStrictTestCase, HTMLParserTolerantTestCase,
-                         AttributesStrictTestCase, AttributesTolerantTestCase)
-
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()