diff --git a/setup.py b/setup.py
index 92c489fbbbb..2e61e208f15 100644
--- a/setup.py
+++ b/setup.py
@@ -52,14 +52,6 @@
 else:  # 2.6, 2.7, 3.3 or later
     requires.append('Jinja2>=2.3')
 
-# tell distribute to use 2to3 with our own fixers
-extra = {}
-if sys.version_info >= (3, 0):
-    extra.update(
-        use_2to3=True,
-        use_2to3_fixers=['custom_fixers']
-    )
-
 # Provide a "compile_catalog" command that also creates the translated
 # JavaScript files if Babel is available.
 
@@ -196,5 +188,4 @@ def run(self):
     },
     install_requires=requires,
     cmdclass=cmdclass,
-    **extra
 )
diff --git a/tests/run.py b/tests/run.py
index e8cf787ffa3..b903165d6a0 100755
--- a/tests/run.py
+++ b/tests/run.py
@@ -15,8 +15,6 @@
 from os import path, chdir, listdir, environ
 import shutil
 
-from six import PY3
-
 
 testroot = path.dirname(__file__) or '.'
 if 'BUILD_TEST_PATH' in environ:
@@ -28,15 +26,9 @@
     newroot = path.join(newroot, listdir(newroot)[0], 'tests')
 
 shutil.rmtree(newroot, ignore_errors=True)
-
-if PY3:
-    print('Copying and converting sources to build/lib/tests...')
-    from distutils.util import copydir_run_2to3
-    copydir_run_2to3(testroot, newroot)
-else:
-    # just copying test directory to parallel testing
-    print('Copying sources to build/lib/tests...')
-    shutil.copytree(testroot, newroot)
+# just copying test directory to parallel testing
+print('Copying sources to build/lib/tests...')
+shutil.copytree(testroot, newroot)
 
 # always test the sphinx package from build/lib/
 sys.path.insert(0, path.abspath(path.join(newroot, path.pardir)))