diff -r dd12639b82bf Lib/test/test_codeccallbacks.py
--- a/Lib/test/test_codeccallbacks.py	Wed Oct 30 12:43:44 2013 -0400
+++ b/Lib/test/test_codeccallbacks.py	Thu Oct 31 12:46:33 2013 +0200
@@ -84,9 +84,9 @@
         tests = [(u'\U0001f49d', '💝'),
                  (u'\ud83d', '�'),
                  (u'\udc9d', '�'),
-                 (u'\ud83d\udc9d', '💝' if len(u'\U0001f49d') > 1 else
-                                   '��'),
                 ]
+        if u'\ud83d\udc9d' != u'\U0001f49d':
+            tests += [(u'\ud83d\udc9d', '��')]
         for encoding in ['ascii', 'latin1', 'iso-8859-15']:
             for s, exp in tests:
                 self.assertEqual(s.encode(encoding, 'xmlcharrefreplace'),
diff -r dd12639b82bf Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py	Wed Oct 30 12:43:44 2013 -0400
+++ b/Lib/test/test_unicode.py	Thu Oct 31 12:46:33 2013 +0200
@@ -1663,9 +1663,9 @@
         tests = [(u'\U0001f49d', '💝'),
                  (u'\ud83d', '�'),
                  (u'\udc9d', '�'),
-                 (u'\ud83d\udc9d', '💝' if len(u'\U0001f49d') > 1 else
-                                  '��'),
                 ]
+        if u'\ud83d\udc9d' != u'\U0001f49d':
+            tests += [(u'\ud83d\udc9d', '��')]
         for s, exp in tests:
             self.assertEqual(
                     unicode_encodedecimal(u"123" + s, "xmlcharrefreplace"),