diff --git a/test/plugin_tests/__init__.py b/test/plugin_tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/lyrics_download_samples.py b/test/plugin_tests/lyrics_download_samples.py
similarity index 97%
rename from test/lyrics_download_samples.py
rename to test/plugin_tests/lyrics_download_samples.py
index f33eafa5d..34c9edd54 100644
--- a/test/lyrics_download_samples.py
+++ b/test/plugin_tests/lyrics_download_samples.py
@@ -17,7 +17,7 @@ import os
 import sys
 import requests
 
-import test_lyrics
+from test.plugin_tests import test_lyrics
 
 
 def mkdir_p(path):
diff --git a/test/test_acousticbrainz.py b/test/plugin_tests/test_acousticbrainz.py
similarity index 100%
rename from test/test_acousticbrainz.py
rename to test/plugin_tests/test_acousticbrainz.py
diff --git a/test/test_albumtypes.py b/test/plugin_tests/test_albumtypes.py
similarity index 100%
rename from test/test_albumtypes.py
rename to test/plugin_tests/test_albumtypes.py
diff --git a/test/test_art.py b/test/plugin_tests/test_art.py
similarity index 100%
rename from test/test_art.py
rename to test/plugin_tests/test_art.py
diff --git a/test/test_bareasc.py b/test/plugin_tests/test_bareasc.py
similarity index 100%
rename from test/test_bareasc.py
rename to test/plugin_tests/test_bareasc.py
diff --git a/test/test_beatport.py b/test/plugin_tests/test_beatport.py
similarity index 100%
rename from test/test_beatport.py
rename to test/plugin_tests/test_beatport.py
diff --git a/test/test_bucket.py b/test/plugin_tests/test_bucket.py
similarity index 100%
rename from test/test_bucket.py
rename to test/plugin_tests/test_bucket.py
diff --git a/test/test_convert.py b/test/plugin_tests/test_convert.py
similarity index 100%
rename from test/test_convert.py
rename to test/plugin_tests/test_convert.py
diff --git a/test/test_discogs.py b/test/plugin_tests/test_discogs.py
similarity index 100%
rename from test/test_discogs.py
rename to test/plugin_tests/test_discogs.py
diff --git a/test/test_edit.py b/test/plugin_tests/test_edit.py
similarity index 100%
rename from test/test_edit.py
rename to test/plugin_tests/test_edit.py
diff --git a/test/test_embedart.py b/test/plugin_tests/test_embedart.py
similarity index 99%
rename from test/test_embedart.py
rename to test/plugin_tests/test_embedart.py
index 23a6f5e54..452d0ef12 100644
--- a/test/test_embedart.py
+++ b/test/plugin_tests/test_embedart.py
@@ -28,7 +28,7 @@ from beets import config, logging, ui
 from beets.util import bytestring_path, displayable_path, syspath
 from beets.util.artresizer import ArtResizer
 from beets import art
-from test.test_art import FetchImageHelper
+from test.plugin_tests.test_art import FetchImageHelper
 
 
 def require_artresizer_compare(test):
diff --git a/test/test_embyupdate.py b/test/plugin_tests/test_embyupdate.py
similarity index 100%
rename from test/test_embyupdate.py
rename to test/plugin_tests/test_embyupdate.py
diff --git a/test/test_export.py b/test/plugin_tests/test_export.py
similarity index 100%
rename from test/test_export.py
rename to test/plugin_tests/test_export.py
diff --git a/test/test_fetchart.py b/test/plugin_tests/test_fetchart.py
similarity index 100%
rename from test/test_fetchart.py
rename to test/plugin_tests/test_fetchart.py
diff --git a/test/test_filefilter.py b/test/plugin_tests/test_filefilter.py
similarity index 100%
rename from test/test_filefilter.py
rename to test/plugin_tests/test_filefilter.py
diff --git a/test/test_ftintitle.py b/test/plugin_tests/test_ftintitle.py
similarity index 100%
rename from test/test_ftintitle.py
rename to test/plugin_tests/test_ftintitle.py
diff --git a/test/test_hook.py b/test/plugin_tests/test_hook.py
similarity index 100%
rename from test/test_hook.py
rename to test/plugin_tests/test_hook.py
diff --git a/test/test_ihate.py b/test/plugin_tests/test_ihate.py
similarity index 100%
rename from test/test_ihate.py
rename to test/plugin_tests/test_ihate.py
diff --git a/test/test_importadded.py b/test/plugin_tests/test_importadded.py
similarity index 100%
rename from test/test_importadded.py
rename to test/plugin_tests/test_importadded.py
diff --git a/test/test_importfeeds.py b/test/plugin_tests/test_importfeeds.py
similarity index 100%
rename from test/test_importfeeds.py
rename to test/plugin_tests/test_importfeeds.py
diff --git a/test/test_info.py b/test/plugin_tests/test_info.py
similarity index 100%
rename from test/test_info.py
rename to test/plugin_tests/test_info.py
diff --git a/test/test_ipfs.py b/test/plugin_tests/test_ipfs.py
similarity index 100%
rename from test/test_ipfs.py
rename to test/plugin_tests/test_ipfs.py
diff --git a/test/test_keyfinder.py b/test/plugin_tests/test_keyfinder.py
similarity index 100%
rename from test/test_keyfinder.py
rename to test/plugin_tests/test_keyfinder.py
diff --git a/test/test_lastgenre.py b/test/plugin_tests/test_lastgenre.py
similarity index 100%
rename from test/test_lastgenre.py
rename to test/plugin_tests/test_lastgenre.py
diff --git a/test/test_limit.py b/test/plugin_tests/test_limit.py
similarity index 100%
rename from test/test_limit.py
rename to test/plugin_tests/test_limit.py
diff --git a/test/test_lyrics.py b/test/plugin_tests/test_lyrics.py
similarity index 100%
rename from test/test_lyrics.py
rename to test/plugin_tests/test_lyrics.py
diff --git a/test/test_mbsubmit.py b/test/plugin_tests/test_mbsubmit.py
similarity index 100%
rename from test/test_mbsubmit.py
rename to test/plugin_tests/test_mbsubmit.py
diff --git a/test/test_mbsync.py b/test/plugin_tests/test_mbsync.py
similarity index 100%
rename from test/test_mbsync.py
rename to test/plugin_tests/test_mbsync.py
diff --git a/test/test_mpdstats.py b/test/plugin_tests/test_mpdstats.py
similarity index 100%
rename from test/test_mpdstats.py
rename to test/plugin_tests/test_mpdstats.py
diff --git a/test/test_parentwork.py b/test/plugin_tests/test_parentwork.py
similarity index 100%
rename from test/test_parentwork.py
rename to test/plugin_tests/test_parentwork.py
diff --git a/test/test_permissions.py b/test/plugin_tests/test_permissions.py
similarity index 100%
rename from test/test_permissions.py
rename to test/plugin_tests/test_permissions.py
diff --git a/test/test_play.py b/test/plugin_tests/test_play.py
similarity index 100%
rename from test/test_play.py
rename to test/plugin_tests/test_play.py
diff --git a/test/test_player.py b/test/plugin_tests/test_player.py
similarity index 100%
rename from test/test_player.py
rename to test/plugin_tests/test_player.py
diff --git a/test/test_playlist.py b/test/plugin_tests/test_playlist.py
similarity index 100%
rename from test/test_playlist.py
rename to test/plugin_tests/test_playlist.py
diff --git a/test/test_plexupdate.py b/test/plugin_tests/test_plexupdate.py
similarity index 100%
rename from test/test_plexupdate.py
rename to test/plugin_tests/test_plexupdate.py
diff --git a/test/test_plugin_mediafield.py b/test/plugin_tests/test_plugin_mediafield.py
similarity index 100%
rename from test/test_plugin_mediafield.py
rename to test/plugin_tests/test_plugin_mediafield.py
diff --git a/test/test_random.py b/test/plugin_tests/test_random.py
similarity index 100%
rename from test/test_random.py
rename to test/plugin_tests/test_random.py
diff --git a/test/test_replaygain.py b/test/plugin_tests/test_replaygain.py
similarity index 100%
rename from test/test_replaygain.py
rename to test/plugin_tests/test_replaygain.py
diff --git a/test/test_smartplaylist.py b/test/plugin_tests/test_smartplaylist.py
similarity index 100%
rename from test/test_smartplaylist.py
rename to test/plugin_tests/test_smartplaylist.py
diff --git a/test/test_spotify.py b/test/plugin_tests/test_spotify.py
similarity index 100%
rename from test/test_spotify.py
rename to test/plugin_tests/test_spotify.py
diff --git a/test/test_subsonicupdate.py b/test/plugin_tests/test_subsonicupdate.py
similarity index 100%
rename from test/test_subsonicupdate.py
rename to test/plugin_tests/test_subsonicupdate.py
diff --git a/test/test_the.py b/test/plugin_tests/test_the.py
similarity index 100%
rename from test/test_the.py
rename to test/plugin_tests/test_the.py
diff --git a/test/test_thumbnails.py b/test/plugin_tests/test_thumbnails.py
similarity index 100%
rename from test/test_thumbnails.py
rename to test/plugin_tests/test_thumbnails.py
diff --git a/test/test_types_plugin.py b/test/plugin_tests/test_types_plugin.py
similarity index 100%
rename from test/test_types_plugin.py
rename to test/plugin_tests/test_types_plugin.py
diff --git a/test/test_web.py b/test/plugin_tests/test_web.py
similarity index 100%
rename from test/test_web.py
rename to test/plugin_tests/test_web.py
diff --git a/test/test_zero.py b/test/plugin_tests/test_zero.py
similarity index 100%
rename from test/test_zero.py
rename to test/plugin_tests/test_zero.py