diff --git a/test/_common.py b/test/_common.py
index 7a3ece4d8..5412ab650 100644
--- a/test/_common.py
+++ b/test/_common.py
@@ -175,8 +175,7 @@ class TestCase(unittest.TestCase, Assertions):
         beets.config['directory'] = \
             util.py3_path(os.path.join(self.temp_dir, b'libdir'))
 
-        # Set $HOME, which is used by confit's `config_dir()` to create
-        # directories.
+        # Set $HOME, which is used by Confuse to create directories.
         self._old_home = os.environ.get('HOME')
         os.environ['HOME'] = util.py3_path(self.temp_dir)
 
diff --git a/test/test_art.py b/test/test_art.py
index 857f5d3c6..556222f48 100644
--- a/test/test_art.py
+++ b/test/test_art.py
@@ -34,7 +34,7 @@ from beets import importer
 from beets import logging
 from beets import util
 from beets.util.artresizer import ArtResizer, WEBPROXY
-from beets.util import confit
+import confuse
 
 
 logger = logging.getLogger('beets.test_art')
@@ -753,7 +753,7 @@ class EnforceRatioConfigTest(_common.TestCase):
         if should_raise:
             for v in values:
                 config['fetchart']['enforce_ratio'] = v
-                with self.assertRaises(confit.ConfigValueError):
+                with self.assertRaises(confuse.ConfigValueError):
                     fetchart.FetchArtPlugin()
         else:
             for v in values:
diff --git a/test/test_lyrics.py b/test/test_lyrics.py
index 4d48ed9ed..f7ea538e2 100644
--- a/test/test_lyrics.py
+++ b/test/test_lyrics.py
@@ -28,7 +28,8 @@ from test import _common
 
 from beets import logging
 from beets.library import Item
-from beets.util import bytestring_path, confit
+from beets.util import bytestring_path
+import confuse
 
 from beetsplug import lyrics
 
@@ -222,7 +223,8 @@ def is_lyrics_content_ok(title, text):
     return keywords <= words
 
 LYRICS_ROOT_DIR = os.path.join(_common.RSRC, b'lyrics')
-LYRICS_TEXTS = confit.load_yaml(os.path.join(_common.RSRC, b'lyricstext.yaml'))
+yaml_path = os.path.join(_common.RSRC, b'lyricstext.yaml')
+LYRICS_TEXTS = confuse.load_yaml(yaml_path)
 
 
 class LyricsGoogleBaseTest(unittest.TestCase):
diff --git a/test/test_player.py b/test/test_player.py
index 6b3e57d53..66f1f5d38 100644
--- a/test/test_player.py
+++ b/test/test_player.py
@@ -31,8 +31,9 @@ import tempfile
 from contextlib import contextmanager
 import random
 
-from beets.util import confit, py3_path
+from beets.util import py3_path
 from beetsplug import bpd
+import confuse
 
 
 # Mock GstPlayer so that the forked process doesn't attempt to import gi:
@@ -285,7 +286,7 @@ class BPDTestHelper(unittest.TestCase, TestHelper):
                 mode='wb', dir=py3_path(self.temp_dir), suffix='.yaml',
                 delete=False)
         config_file.write(
-                yaml.dump(config, Dumper=confit.Dumper, encoding='utf-8'))
+                yaml.dump(config, Dumper=confuse.Dumper, encoding='utf-8'))
         config_file.close()
 
         # Fork and launch BPD in the new process:
diff --git a/test/test_types_plugin.py b/test/test_types_plugin.py
index 541bd30df..77d6c8bcf 100644
--- a/test/test_types_plugin.py
+++ b/test/test_types_plugin.py
@@ -21,7 +21,7 @@ import unittest
 
 from test.helper import TestHelper
 
-from beets.util.confit import ConfigValueError
+from confuse import ConfigValueError
 
 
 class TypesPluginTest(unittest.TestCase, TestHelper):
diff --git a/test/test_ui.py b/test/test_ui.py
index 9aae9584b..da3160db7 100644
--- a/test/test_ui.py
+++ b/test/test_ui.py
@@ -38,7 +38,7 @@ from beets.autotag.match import distance
 from mediafile import MediaFile
 from beets import config
 from beets import plugins
-from beets.util.confit import ConfigError
+from confuse import ConfigError
 from beets import util
 from beets.util import syspath, MoveOperation