Index: Lib/test/test_pep277.py
===================================================================
--- Lib/test/test_pep277.py	(revision 79135)
+++ Lib/test/test_pep277.py	(working copy)
@@ -86,6 +86,11 @@
         f1 = os.listdir(test_support.TESTFN)
         f2 = os.listdir(unicode(test_support.TESTFN,
                                 sys.getfilesystemencoding()))
+        if sys.platform == 'darwin':
+            # Mac OS X returns canonically decomposed Unicode (Normal Form D)
+            # http://developer.apple.com/mac/library/qa/qa2001/qa1173.html
+            from unicodedata import normalize
+            f2 = (normalize('NFC', f) for f in f2)
         sf2 = set(os.path.join(unicode(test_support.TESTFN), f)
                   for f in f2)
         self.assertEqual(len(f1), len(self.files))