diff --git a/python/moz.build b/python/moz.build
index 44558abc51ed..ffbb89e950d7 100644
--- a/python/moz.build
+++ b/python/moz.build
@@ -62,7 +62,6 @@ PYTHON_UNITTEST_MANIFESTS += [
     'mozbuild/mozbuild/test/python.ini',
     'mozbuild/mozbuild/test/python2.ini',
     'mozbuild/mozpack/test/python.ini',
-    'mozbuild/mozpack/test/python2.ini',
     'mozlint/test/python.ini',
     'mozrelease/test/python.ini',
     'mozterm/test/python.ini',
diff --git a/python/mozbuild/mozpack/copier.py b/python/mozbuild/mozpack/copier.py
index cf8462ea9391..25a3eae71ecb 100644
--- a/python/mozbuild/mozpack/copier.py
+++ b/python/mozbuild/mozpack/copier.py
@@ -4,26 +4,18 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
+import concurrent.futures as futures
+import errno
 import os
-import six
 import stat
 import sys
+from collections import Counter, OrderedDict, defaultdict
+
+import six
 
-from mozpack.errors import errors
-from mozpack.files import (
-    BaseFile,
-    DeflatedFile,
-    Dest,
-    ManifestFile,
-)
 import mozpack.path as mozpath
-import errno
-from collections import (
-    defaultdict,
-    Counter,
-    OrderedDict,
-)
-import concurrent.futures as futures
+from mozpack.errors import errors
+from mozpack.files import BaseFile, DeflatedFile, Dest, ManifestFile
 
 
 class FileRegistry(object):
diff --git a/python/mozbuild/mozpack/test/python.ini b/python/mozbuild/mozpack/test/python.ini
index e1dbc6f51810..147fc704c9ac 100644
--- a/python/mozbuild/mozpack/test/python.ini
+++ b/python/mozbuild/mozpack/test/python.ini
@@ -4,6 +4,7 @@ subsuite = mozbuild
 [test_archive.py]
 [test_chrome_flags.py]
 [test_chrome_manifest.py]
+[test_copier.py]
 [test_errors.py]
 [test_files.py]
 [test_manifests.py]
diff --git a/python/mozbuild/mozpack/test/python2.ini b/python/mozbuild/mozpack/test/python2.ini
deleted file mode 100644
index 2fbe55472def..000000000000
--- a/python/mozbuild/mozpack/test/python2.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-subsuite = mozbuild
-skip-if = python == 3
-
-[test_copier.py]