#16910: test_bytes, test_unicode, and test_userstring now work with unittest test discovery.  Patch by Zachary Ware.
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 9aaedd3..8fccab3 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -33,7 +33,8 @@
 
 class UnicodeTest(string_tests.CommonTest,
         string_tests.MixinStrUnicodeUserStringTest,
-        string_tests.MixinStrUnicodeTest):
+        string_tests.MixinStrUnicodeTest,
+        unittest.TestCase):
 
     type2test = str
 
@@ -2218,8 +2219,5 @@
         self.assertRaises(TypeError, _string.formatter_field_name_split, 1)
 
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()