Merge with default

1 files changed, 4 insertions, 1 deletions

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 8d6aff19..65a9f0b3 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """sdist tests"""
 
-
+import locale
 import os
 import shutil
 import sys
@@ -11,6 +11,7 @@ import unicodedata
 from setuptools.tests import environment
 
 from setuptools.compat import StringIO, unicode
+from setuptools.tests.py26compat import skipIf
 from setuptools.command.sdist import sdist, walk_revctrl
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
@@ -320,6 +321,8 @@ class TestSdistTest(unittest.TestCase):
             filename = filename.decode('latin-1')
             self.assertFalse(filename in cmd.filelist.files)
 
+    @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8',
+            'Unittest fails if locale is not utf-8 but the manifests is recorded correctly')
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)