4 files changed, 5 insertions, 6 deletions
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 7da122cc..1a122186 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -4,9 +4,9 @@ import sys
 import os, re, shutil, tempfile, unittest
 import tempfile
 import site
-from StringIO import StringIO
 
 from distutils.errors import DistutilsError
+from setuptools.compat import StringIO
 from setuptools.command.bdist_egg import bdist_egg
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index d9e50224..b596d37f 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -3,7 +3,7 @@
 import sys
 import unittest
 import pkg_resources
-from setuptools.compat import urllib2, httplib, HTTPError
+from setuptools.compat import urllib2, httplib, HTTPError, unicode
 import distutils.errors
 import setuptools.package_index
 from setuptools.tests.server import IndexServer
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 7e2f0a49..49007c3d 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -7,9 +7,8 @@ import shutil
 import sys
 import tempfile
 import unittest
-from StringIO import StringIO
-
 
+from setuptools.compat import StringIO
 from setuptools.command.sdist import sdist
 from setuptools.dist import Distribution
 
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index ad7cbd0f..e7022995 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -6,9 +6,9 @@ import sys
 import os, shutil, tempfile, unittest
 import tempfile
 import site
-from StringIO import StringIO
 
 from distutils.errors import DistutilsError
+from setuptools.compat import StringIO
 from setuptools.command.test import test
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
@@ -121,4 +121,4 @@ class TestTestTest(unittest.TestCase):
                 pass
         finally:
             sys.stdout = old_stdout
-            
-\ No newline at end of file
+