Index: module/unicodedata/test/test_unicodedata.py
===================================================================
--- module/unicodedata/test/test_unicodedata.py	(revision 16596)
+++ module/unicodedata/test/test_unicodedata.py	(working copy)
@@ -42,9 +42,12 @@
 
     def test_cjk(self):
         import unicodedata
+        import sys
         for first, last in ((0x3400, 0x4DB5),
                             (0x4E00, 0x9FA5), # 9FBB in Unicode 4.1
                             (0x20000, 0x2A6D6)):
+            if last + 1 > sys.maxunicode:
+            	continue
             # Test at and inside the boundary
             for i in (first, first + 1, last - 1, last):
                 charname = 'CJK UNIFIED IDEOGRAPH-%X'%i
Index: module/__builtin__/test/impsubdir/compiled/x.pyc
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: lib/test2/test_file_extra.py
===================================================================
--- lib/test2/test_file_extra.py	(revision 16596)
+++ lib/test2/test_file_extra.py	(working copy)
@@ -27,7 +27,7 @@
     def test_repr(self):
         r = repr(self.file)
         assert r.find('open file') >= 0
-        assert r.find(self.file.name) >= 0
+        assert r.find(repr(self.file.name)) >= 0
         assert r.find(self.file.mode) >= 0
 
 class TestFdFile(TestFile):