#16910: merge with 3.3.

diff --cc Lib/test/test_bytes.py
Simple merge

diff --cc Lib/test/test_unicode.py
Simple merge

diff --cc Misc/NEWS
index 76ae11ea50b88e967d773162f7d492a017496e53,0c1be4610dfc658a898c4272926ccba73e4feb50..926a15b0e3366829cf6ad38596ccf5a22ad8e7eb
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -612,8 -408,9 +612,11 @@@ Extension Module
  Tests
  -----
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #16910: test_bytes, test_unicode, and test_userstring now work with
+   unittest test discovery.  Patch by Zachary Ware.
+ 
  - Issue #16905: test_warnings now works with unittest test discovery.
    Initial patch by Berker Peksag.