diff --git a/test/test_acousticbrainz.py b/test/test_acousticbrainz.py
index c6cce0f13..0b1407581 100644
--- a/test/test_acousticbrainz.py
+++ b/test/test_acousticbrainz.py
@@ -20,8 +20,9 @@ from __future__ import division, absolute_import, print_function
 
 import json
 import os.path
+import unittest
 
-from test._common import unittest, RSRC
+from test._common import RSRC
 
 from beetsplug.acousticbrainz import AcousticPlugin, ABSCHEME
 
diff --git a/test/test_art.py b/test/test_art.py
index 5c3a4d7e9..aba180780 100644
--- a/test/test_art.py
+++ b/test/test_art.py
@@ -19,12 +19,12 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import shutil
+import unittest
 
 import responses
 from mock import patch
 
 from test import _common
-from test._common import unittest
 from beetsplug import fetchart
 from beets.autotag import AlbumInfo, AlbumMatch
 from beets import config
diff --git a/test/test_autotag.py b/test/test_autotag.py
index b2f3fd61d..6f107afa4 100644
--- a/test/test_autotag.py
+++ b/test/test_autotag.py
@@ -19,9 +19,9 @@ from __future__ import division, absolute_import, print_function
 
 import re
 import copy
+import unittest
 
 from test import _common
-from test._common import unittest
 from beets import autotag
 from beets.autotag import match
 from beets.autotag.hooks import Distance, string_dist
diff --git a/test/test_bucket.py b/test/test_bucket.py
index daade86ad..61f6cfe24 100644
--- a/test/test_bucket.py
+++ b/test/test_bucket.py
@@ -17,7 +17,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from beetsplug import bucket
 from beets import config, ui
 
diff --git a/test/test_config_command.py b/test/test_config_command.py
index 26242132d..35ba6ca0e 100644
--- a/test/test_config_command.py
+++ b/test/test_config_command.py
@@ -7,11 +7,11 @@ import yaml
 from mock import patch
 from tempfile import mkdtemp
 from shutil import rmtree
+import unittest
 
 from beets import ui
 from beets import config
 
-from test._common import unittest
 from test.helper import TestHelper
 from beets.library import Library
 import six
diff --git a/test/test_convert.py b/test/test_convert.py
index 0d1804288..2a32e51e7 100644
--- a/test/test_convert.py
+++ b/test/test_convert.py
@@ -17,8 +17,9 @@ from __future__ import division, absolute_import, print_function
 
 import re
 import os.path
+import unittest
+
 from test import _common
-from test._common import unittest
 from test import helper
 from test.helper import control_stdin, capture_log
 
diff --git a/test/test_datequery.py b/test/test_datequery.py
index c139c0c4a..1e1625db2 100644
--- a/test/test_datequery.py
+++ b/test/test_datequery.py
@@ -18,8 +18,8 @@
 from __future__ import division, absolute_import, print_function
 
 from test import _common
-from test._common import unittest
 from datetime import datetime
+import unittest
 import time
 from beets.dbcore.query import _parse_periods, DateInterval, DateQuery
 
diff --git a/test/test_dbcore.py b/test/test_dbcore.py
index bb6a56fab..d070e257e 100644
--- a/test/test_dbcore.py
+++ b/test/test_dbcore.py
@@ -20,10 +20,10 @@ from __future__ import division, absolute_import, print_function
 import os
 import shutil
 import sqlite3
+import unittest
 from six import assertRaisesRegex
 
 from test import _common
-from test._common import unittest
 from beets import dbcore
 from tempfile import mkstemp
 import six
diff --git a/test/test_discogs.py b/test/test_discogs.py
index 0f89ff923..5fe5926b8 100644
--- a/test/test_discogs.py
+++ b/test/test_discogs.py
@@ -17,8 +17,9 @@
 """
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from test import _common
-from test._common import unittest, Bag
+from test._common import Bag
 
 from beetsplug.discogs import DiscogsPlugin
 
diff --git a/test/test_edit.py b/test/test_edit.py
index a23860b07..2900d092a 100644
--- a/test/test_edit.py
+++ b/test/test_edit.py
@@ -15,10 +15,10 @@
 
 from __future__ import division, absolute_import, print_function
 import codecs
+import unittest
 
 from mock import patch
 from test import _common
-from test._common import unittest
 from test.helper import TestHelper, control_stdin
 from test.test_ui_importer import TerminalImportSessionSetup
 from test.test_importer import ImportHelper, AutotagStub
diff --git a/test/test_embedart.py b/test/test_embedart.py
index 0d64b0d9a..ee08ecb4e 100644
--- a/test/test_embedart.py
+++ b/test/test_embedart.py
@@ -19,9 +19,9 @@ import os.path
 import shutil
 from mock import patch, MagicMock
 import tempfile
+import unittest
 
 from test import _common
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets.mediafile import MediaFile
diff --git a/test/test_embyupdate.py b/test/test_embyupdate.py
index 17e82c73e..2b83a4896 100644
--- a/test/test_embyupdate.py
+++ b/test/test_embyupdate.py
@@ -2,9 +2,9 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
 from test.helper import TestHelper
 from beetsplug import embyupdate
+import unittest
 import responses
 
 
diff --git a/test/test_fetchart.py b/test/test_fetchart.py
index 5def538eb..91bc34101 100644
--- a/test/test_fetchart.py
+++ b/test/test_fetchart.py
@@ -16,7 +16,7 @@
 from __future__ import division, absolute_import, print_function
 
 import os
-from test._common import unittest
+import unittest
 from test.helper import TestHelper
 from beets import util
 
diff --git a/test/test_filefilter.py b/test/test_filefilter.py
index 09b6d94a4..e7a4119d4 100644
--- a/test/test_filefilter.py
+++ b/test/test_filefilter.py
@@ -20,9 +20,9 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import shutil
+import unittest
 
 from test import _common
-from test._common import unittest
 from test.helper import capture_log
 from test.test_importer import ImportHelper
 from beets import config
diff --git a/test/test_files.py b/test/test_files.py
index 884aa40d0..b566f363e 100644
--- a/test/test_files.py
+++ b/test/test_files.py
@@ -21,9 +21,9 @@ import shutil
 import os
 import stat
 from os.path import join
+import unittest
 
 from test import _common
-from test._common import unittest
 from test._common import item, touch
 import beets.library
 from beets import util
diff --git a/test/test_ftintitle.py b/test/test_ftintitle.py
index 711b5daa6..d698263be 100644
--- a/test/test_ftintitle.py
+++ b/test/test_ftintitle.py
@@ -17,7 +17,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from test.helper import TestHelper
 from beetsplug import ftintitle
 
diff --git a/test/test_hidden.py b/test/test_hidden.py
index cb673a64a..e2dd1afb3 100644
--- a/test/test_hidden.py
+++ b/test/test_hidden.py
@@ -17,7 +17,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 import sys
 import tempfile
 from beets.util import hidden
diff --git a/test/test_hook.py b/test/test_hook.py
index cd6b2734f..39fd08959 100644
--- a/test/test_hook.py
+++ b/test/test_hook.py
@@ -17,9 +17,9 @@ from __future__ import division, absolute_import, print_function
 
 import os.path
 import tempfile
+import unittest
 
 from test import _common
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets import config
diff --git a/test/test_ihate.py b/test/test_ihate.py
index 1b23964ae..f52617481 100644
--- a/test/test_ihate.py
+++ b/test/test_ihate.py
@@ -4,7 +4,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from beets import importer
 from beets.library import Item
 from beetsplug.ihate import IHatePlugin
diff --git a/test/test_importadded.py b/test/test_importadded.py
index bd8d8b506..52aa26756 100644
--- a/test/test_importadded.py
+++ b/test/test_importadded.py
@@ -18,8 +18,8 @@ from __future__ import division, absolute_import, print_function
 """Tests for the `importadded` plugin."""
 
 import os
+import unittest
 
-from test._common import unittest
 from test.test_importer import ImportHelper, AutotagStub
 from beets import importer
 from beets import util
diff --git a/test/test_importer.py b/test/test_importer.py
index 55b03378c..500ca027d 100644
--- a/test/test_importer.py
+++ b/test/test_importer.py
@@ -27,9 +27,9 @@ from tempfile import mkstemp
 from zipfile import ZipFile
 from tarfile import TarFile
 from mock import patch, Mock
+import unittest
 
 from test import _common
-from test._common import unittest
 from beets.util import displayable_path, bytestring_path, py3_path
 from test.helper import TestImportSession, TestHelper, has_program, capture_log
 from beets import importer
diff --git a/test/test_importfeeds.py b/test/test_importfeeds.py
index adb2885c7..064f5eee5 100644
--- a/test/test_importfeeds.py
+++ b/test/test_importfeeds.py
@@ -6,8 +6,8 @@ import os
 import os.path
 import tempfile
 import shutil
+import unittest
 
-from test._common import unittest
 from beets import config
 from beets.library import Item, Album, Library
 from beetsplug.importfeeds import ImportFeedsPlugin
diff --git a/test/test_info.py b/test/test_info.py
index f7973796e..f5375e2f6 100644
--- a/test/test_info.py
+++ b/test/test_info.py
@@ -15,7 +15,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from test.helper import TestHelper
 
 from beets.mediafile import MediaFile
diff --git a/test/test_ipfs.py b/test/test_ipfs.py
index 66d895f2e..9c523d6e5 100644
--- a/test/test_ipfs.py
+++ b/test/test_ipfs.py
@@ -20,11 +20,12 @@ from beets import library
 from beets.util import bytestring_path, _fsencoding
 from beetsplug.ipfs import IPFSPlugin
 
-from test import _common
-from test._common import unittest
-from test.helper import TestHelper
+import unittest
 import os
 
+from test import _common
+from test.helper import TestHelper
+
 
 @patch('beets.util.command_output', Mock())
 class IPFSPluginTest(unittest.TestCase, TestHelper):
diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py
index 57e2bcd9c..c2b4227d7 100644
--- a/test/test_keyfinder.py
+++ b/test/test_keyfinder.py
@@ -16,7 +16,7 @@
 from __future__ import division, absolute_import, print_function
 
 from mock import patch
-from test._common import unittest
+import unittest
 from test.helper import TestHelper
 
 from beets.library import Item
diff --git a/test/test_lastgenre.py b/test/test_lastgenre.py
index c060e95a9..f57471f1c 100644
--- a/test/test_lastgenre.py
+++ b/test/test_lastgenre.py
@@ -17,10 +17,10 @@
 
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from mock import Mock
 
 from test import _common
-from test._common import unittest
 from beetsplug import lastgenre
 from beets import config
 
diff --git a/test/test_library.py b/test/test_library.py
index 174e6d527..26c78c99d 100644
--- a/test/test_library.py
+++ b/test/test_library.py
@@ -25,9 +25,9 @@ import re
 import unicodedata
 import sys
 import time
+import unittest
 
 from test import _common
-from test._common import unittest
 from test._common import item
 import beets.library
 import beets.mediafile
diff --git a/test/test_logging.py b/test/test_logging.py
index 6e5e6c8b6..a6b02a572 100644
--- a/test/test_logging.py
+++ b/test/test_logging.py
@@ -7,12 +7,13 @@ import sys
 import threading
 import logging as log
 from six import StringIO
+import unittest
 
 import beets.logging as blog
 from beets import plugins, ui
 import beetsplug
 from test import _common
-from test._common import unittest, TestCase
+from test._common import TestCase
 from test import helper
 import six
 
diff --git a/test/test_lyrics.py b/test/test_lyrics.py
index 429dee4e8..13ba07fdf 100644
--- a/test/test_lyrics.py
+++ b/test/test_lyrics.py
@@ -18,13 +18,13 @@
 from __future__ import division, absolute_import, print_function
 
 import os
-from test import _common
 import sys
 import re
+import unittest
 
+from test import _common
 from mock import MagicMock
 
-from test._common import unittest
 from beetsplug import lyrics
 from beets.library import Item
 from beets.util import confit, bytestring_path
diff --git a/test/test_mb.py b/test/test_mb.py
index 43656451d..ecbcf3c59 100644
--- a/test/test_mb.py
+++ b/test/test_mb.py
@@ -18,9 +18,10 @@
 from __future__ import division, absolute_import, print_function
 
 from test import _common
-from test._common import unittest
 from beets.autotag import mb
 from beets import config
+
+import unittest
 import mock
 
 
diff --git a/test/test_mbsubmit.py b/test/test_mbsubmit.py
index a33d8418b..3402c8464 100644
--- a/test/test_mbsubmit.py
+++ b/test/test_mbsubmit.py
@@ -15,7 +15,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from test.helper import capture_stdout, control_stdin, TestHelper
 from test.test_importer import ImportHelper, AutotagStub
 from test.test_ui_importer import TerminalImportSessionSetup
diff --git a/test/test_mbsync.py b/test/test_mbsync.py
index 57213878c..411af8d0a 100644
--- a/test/test_mbsync.py
+++ b/test/test_mbsync.py
@@ -15,9 +15,9 @@
 
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from mock import patch
 
-from test._common import unittest
 from test.helper import TestHelper,\
     generate_album_info, \
     generate_track_info, \
diff --git a/test/test_mediafile.py b/test/test_mediafile.py
index 280698a9a..458ad6d8a 100644
--- a/test/test_mediafile.py
+++ b/test/test_mediafile.py
@@ -23,10 +23,10 @@ import shutil
 import tempfile
 import datetime
 import time
+import unittest
 from six import assertCountEqual
 
 from test import _common
-from test._common import unittest
 from beets.mediafile import MediaFile, Image, \
     ImageType, CoverArtField, UnreadableFileError
 
diff --git a/test/test_mediafile_edge.py b/test/test_mediafile_edge.py
index 81a6c4416..2aae30c55 100644
--- a/test/test_mediafile_edge.py
+++ b/test/test_mediafile_edge.py
@@ -19,10 +19,10 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import shutil
+import unittest
 import mutagen.id3
 
 from test import _common
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets import mediafile
diff --git a/test/test_metasync.py b/test/test_metasync.py
index 60f63c413..ef16c57a2 100644
--- a/test/test_metasync.py
+++ b/test/test_metasync.py
@@ -21,9 +21,9 @@ import time
 from datetime import datetime
 from beets.library import Item
 from beets.util import py3_path
+import unittest
 
 from test import _common
-from test._common import unittest
 from test.helper import TestHelper
 
 
diff --git a/test/test_mpdstats.py b/test/test_mpdstats.py
index febf292d8..7452be86b 100644
--- a/test/test_mpdstats.py
+++ b/test/test_mpdstats.py
@@ -15,8 +15,8 @@
 
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from mock import Mock, patch, call, ANY
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets.library import Item
diff --git a/test/test_permissions.py b/test/test_permissions.py
index 040839110..ed84798f1 100644
--- a/test/test_permissions.py
+++ b/test/test_permissions.py
@@ -6,9 +6,9 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import platform
+import unittest
 from mock import patch, Mock
 
-from test._common import unittest
 from test.helper import TestHelper
 from beets.util import displayable_path
 from beetsplug.permissions import (check_permissions,
diff --git a/test/test_pipeline.py b/test/test_pipeline.py
index 4d3bde4d0..228deb50e 100644
--- a/test/test_pipeline.py
+++ b/test/test_pipeline.py
@@ -18,8 +18,8 @@
 from __future__ import division, absolute_import, print_function
 
 import six
+import unittest
 
-from test._common import unittest
 from beets.util import pipeline
 
 
diff --git a/test/test_play.py b/test/test_play.py
index c05e24c51..9d66d7466 100644
--- a/test/test_play.py
+++ b/test/test_play.py
@@ -19,9 +19,9 @@ from __future__ import division, absolute_import, print_function
 
 import os
 
+import unittest
 from mock import patch, ANY
 
-from test._common import unittest
 from test.helper import TestHelper, control_stdin
 
 from beets.ui import UserError
diff --git a/test/test_player.py b/test/test_player.py
index c8fec446b..0a576f0ba 100644
--- a/test/test_player.py
+++ b/test/test_player.py
@@ -17,7 +17,7 @@
 """
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from beetsplug import bpd
 
 
diff --git a/test/test_plexupdate.py b/test/test_plexupdate.py
index 2a2b1cbaf..f8b0bdcd9 100644
--- a/test/test_plexupdate.py
+++ b/test/test_plexupdate.py
@@ -2,9 +2,9 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
 from test.helper import TestHelper
 from beetsplug.plexupdate import get_music_section, update_plex
+import unittest
 import responses
 
 
diff --git a/test/test_plugins.py b/test/test_plugins.py
index d45e317ca..c4a5792ff 100644
--- a/test/test_plugins.py
+++ b/test/test_plugins.py
@@ -19,6 +19,7 @@ import os
 from mock import patch, Mock, ANY
 import shutil
 import itertools
+import unittest
 
 from beets.importer import SingletonImportTask, SentinelImportTask, \
     ArchiveImportTask, action
@@ -30,7 +31,7 @@ from beets.util import displayable_path, bytestring_path
 
 from test.test_importer import ImportHelper, AutotagStub
 from test.test_ui_importer import TerminalImportSessionSetup
-from test._common import unittest, RSRC
+from test._common import RSRC
 from test import helper
 
 
diff --git a/test/test_query.py b/test/test_query.py
index e0bbebfe1..41672ab35 100644
--- a/test/test_query.py
+++ b/test/test_query.py
@@ -21,9 +21,9 @@ from functools import partial
 from mock import patch
 import os
 import sys
+import unittest
 
 from test import _common
-from test._common import unittest
 from test import helper
 
 import beets.library
diff --git a/test/test_replaygain.py b/test/test_replaygain.py
index d2a8aa9ba..6ea21ecb6 100644
--- a/test/test_replaygain.py
+++ b/test/test_replaygain.py
@@ -16,14 +16,15 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
+import six
+
 from test.helper import TestHelper, has_program
 
 from beets import config
 from beets.mediafile import MediaFile
 from beetsplug.replaygain import (FatalGstreamerPluginReplayGainError,
                                   GStreamerBackend)
-import six
 
 try:
     import gi
diff --git a/test/test_smartplaylist.py b/test/test_smartplaylist.py
index 5e1fed084..af60501a4 100644
--- a/test/test_smartplaylist.py
+++ b/test/test_smartplaylist.py
@@ -18,6 +18,7 @@ from __future__ import division, absolute_import, print_function
 from os import path, remove
 from tempfile import mkdtemp
 from shutil import rmtree
+import unittest
 
 from mock import Mock, MagicMock
 
@@ -29,7 +30,6 @@ from beets.util import syspath, bytestring_path, py3_path, CHAR_REPLACE
 from beets.ui import UserError
 from beets import config
 
-from test._common import unittest
 from test.helper import TestHelper
 
 
diff --git a/test/test_sort.py b/test/test_sort.py
index d10bd5759..d611ff2d6 100644
--- a/test/test_sort.py
+++ b/test/test_sort.py
@@ -17,8 +17,8 @@
 """
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from test import _common
-from test._common import unittest
 import beets.library
 from beets import dbcore
 from beets import config
diff --git a/test/test_spotify.py b/test/test_spotify.py
index 20101d76c..17f3ef42f 100644
--- a/test/test_spotify.py
+++ b/test/test_spotify.py
@@ -6,9 +6,9 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import responses
+import unittest
 
 from test import _common
-from test._common import unittest
 from beets import config
 from beets.library import Item
 from beetsplug import spotify
diff --git a/test/test_template.py b/test/test_template.py
index 67d5d97fe..1cbe9be0c 100644
--- a/test/test_template.py
+++ b/test/test_template.py
@@ -17,9 +17,9 @@
 """
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
-from beets.util import functemplate
+import unittest
 import six
+from beets.util import functemplate
 
 
 def _normexpr(expr):
diff --git a/test/test_the.py b/test/test_the.py
index 422723386..72e9bf161 100644
--- a/test/test_the.py
+++ b/test/test_the.py
@@ -4,7 +4,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from test import _common
 from beets import config
 from beetsplug.the import ThePlugin, PATTERN_A, PATTERN_THE, FORMAT
diff --git a/test/test_thumbnails.py b/test/test_thumbnails.py
index fe1c80f4a..d287c073a 100644
--- a/test/test_thumbnails.py
+++ b/test/test_thumbnails.py
@@ -19,8 +19,8 @@ import os.path
 from mock import Mock, patch, call
 from tempfile import mkdtemp
 from shutil import rmtree
+import unittest
 
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets.util import bytestring_path
diff --git a/test/test_types_plugin.py b/test/test_types_plugin.py
index 826dd5ea7..541bd30df 100644
--- a/test/test_types_plugin.py
+++ b/test/test_types_plugin.py
@@ -17,8 +17,8 @@ from __future__ import division, absolute_import, print_function
 
 import time
 from datetime import datetime
+import unittest
 
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets.util.confit import ConfigValueError
diff --git a/test/test_ui.py b/test/test_ui.py
index 99459603a..681900ae4 100644
--- a/test/test_ui.py
+++ b/test/test_ui.py
@@ -24,10 +24,10 @@ import subprocess
 import platform
 from copy import deepcopy
 import six
+import unittest
 
 from mock import patch, Mock
 from test import _common
-from test._common import unittest
 from test.helper import capture_stdout, has_program, TestHelper, control_stdin
 
 from beets import library
diff --git a/test/test_ui_commands.py b/test/test_ui_commands.py
index 5cd1131eb..764d1b009 100644
--- a/test/test_ui_commands.py
+++ b/test/test_ui_commands.py
@@ -20,9 +20,9 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import shutil
+import unittest
 
 from test import _common
-from test._common import unittest
 
 from beets import library
 from beets import ui
diff --git a/test/test_ui_importer.py b/test/test_ui_importer.py
index cc2938ad3..48a66dc5f 100644
--- a/test/test_ui_importer.py
+++ b/test/test_ui_importer.py
@@ -20,8 +20,9 @@ test_importer module. But here the test importer inherits from
 """
 
 from __future__ import division, absolute_import, print_function
+import unittest
 
-from test._common import unittest, DummyIO
+from test._common import DummyIO
 from test import test_importer
 from beets.ui.commands import TerminalImportSession
 from beets import importer
diff --git a/test/test_ui_init.py b/test/test_ui_init.py
index 0628d3879..3a146b0c0 100644
--- a/test/test_ui_init.py
+++ b/test/test_ui_init.py
@@ -18,8 +18,8 @@
 
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from test import _common
-from test._common import unittest
 
 from beets import ui
 
diff --git a/test/test_util.py b/test/test_util.py
index 96d02f955..0d0bbd7b0 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -20,10 +20,10 @@ import sys
 import re
 import os
 import subprocess
+import unittest
 
 from mock import patch, Mock
 
-from test._common import unittest
 from test import _common
 from beets import util
 import six
diff --git a/test/test_vfs.py b/test/test_vfs.py
index 0b25a1031..b94acfd09 100644
--- a/test/test_vfs.py
+++ b/test/test_vfs.py
@@ -16,8 +16,8 @@
 """Tests for the virtual filesystem builder.."""
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from test import _common
-from test._common import unittest
 from beets import library
 from beets import vfs
 
diff --git a/test/test_web.py b/test/test_web.py
index 7d477227c..e72ecf33d 100644
--- a/test/test_web.py
+++ b/test/test_web.py
@@ -4,9 +4,9 @@
 
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from six import assertCountEqual
 
-from test._common import unittest
 from test import _common
 import json
 from beets.library import Item, Album
diff --git a/test/test_zero.py b/test/test_zero.py
index 7b90e22b3..5842d9ed4 100644
--- a/test/test_zero.py
+++ b/test/test_zero.py
@@ -4,7 +4,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from test.helper import TestHelper
 
 from beets.library import Item
diff --git a/test/testall.py b/test/testall.py
index aebda21ee..88eb70117 100755
--- a/test/testall.py
+++ b/test/testall.py
@@ -20,8 +20,7 @@ from __future__ import division, absolute_import, print_function
 import os
 import re
 import sys
-
-from test._common import unittest
+import unittest
 
 pkgpath = os.path.dirname(__file__) or '.'
 sys.path.append(pkgpath)