diff --git a/tests/test_artist_source_detail.py b/tests/metadata/test_artist_source_detail.py
similarity index 100%
rename from tests/test_artist_source_detail.py
rename to tests/metadata/test_artist_source_detail.py
diff --git a/tests/test_artist_source_lookup.py b/tests/metadata/test_artist_source_lookup.py
similarity index 100%
rename from tests/test_artist_source_lookup.py
rename to tests/metadata/test_artist_source_lookup.py
diff --git a/tests/test_enrichment_events.py b/tests/metadata/test_enrichment_events.py
similarity index 100%
rename from tests/test_enrichment_events.py
rename to tests/metadata/test_enrichment_events.py
diff --git a/tests/test_metadata_cache_batch_lookup.py b/tests/metadata/test_metadata_cache_batch_lookup.py
similarity index 100%
rename from tests/test_metadata_cache_batch_lookup.py
rename to tests/metadata/test_metadata_cache_batch_lookup.py
diff --git a/tests/test_metadata_enrichment.py b/tests/metadata/test_metadata_enrichment.py
similarity index 100%
rename from tests/test_metadata_enrichment.py
rename to tests/metadata/test_metadata_enrichment.py
diff --git a/tests/test_metadata_gap_filler.py b/tests/metadata/test_metadata_gap_filler.py
similarity index 100%
rename from tests/test_metadata_gap_filler.py
rename to tests/metadata/test_metadata_gap_filler.py
diff --git a/tests/test_metadata_service_album_tracks.py b/tests/metadata/test_metadata_service_album_tracks.py
similarity index 100%
rename from tests/test_metadata_service_album_tracks.py
rename to tests/metadata/test_metadata_service_album_tracks.py
diff --git a/tests/test_metadata_service_artist_image.py b/tests/metadata/test_metadata_service_artist_image.py
similarity index 100%
rename from tests/test_metadata_service_artist_image.py
rename to tests/metadata/test_metadata_service_artist_image.py
diff --git a/tests/test_metadata_service_cache.py b/tests/metadata/test_metadata_service_cache.py
similarity index 100%
rename from tests/test_metadata_service_cache.py
rename to tests/metadata/test_metadata_service_cache.py
diff --git a/tests/test_metadata_service_discography.py b/tests/metadata/test_metadata_service_discography.py
similarity index 100%
rename from tests/test_metadata_service_discography.py
rename to tests/metadata/test_metadata_service_discography.py
diff --git a/tests/test_metadata_service_musicmap.py b/tests/metadata/test_metadata_service_musicmap.py
similarity index 100%
rename from tests/test_metadata_service_musicmap.py
rename to tests/metadata/test_metadata_service_musicmap.py
diff --git a/tests/test_metadata_service_single_import_context.py b/tests/metadata/test_metadata_service_single_import_context.py
similarity index 100%
rename from tests/test_metadata_service_single_import_context.py
rename to tests/metadata/test_metadata_service_single_import_context.py
diff --git a/tests/test_musicbrainz_search.py b/tests/metadata/test_musicbrainz_search.py
similarity index 100%
rename from tests/test_musicbrainz_search.py
rename to tests/metadata/test_musicbrainz_search.py