diff --git a/docs/changelog.rst b/docs/changelog.rst
index b182a6cba..8a16399f9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,8 @@ New features:
 
 - :doc:`plugins/lastgenre`: Add a ``--pretend`` option to preview genre changes
   without storing or writing them.
+- :doc:`plugins/discogs`: New config option `strip_disambiguation` to toggle
+  stripping discogs numeric disambiguation on artist and label fields.
 
 Bug fixes:
 
@@ -21,12 +23,8 @@ Bug fixes:
 - :doc:`plugins/spotify` Removed old and undocumented config options
   `artist_field`, `album_field` and `track` that were causing issues with track
   matching. :bug:`5189`
-- :doc:`plugins/discogs` Added config option `strip_disambiguation` to allow
-  choice of removing discogs numeric disambiguation :bug:`5366`
 - :doc:`plugins/discogs` Fixed inconsistency in stripping disambiguation from
   artists but not labels. :bug:`5366`
-- :doc:`plugins/discogs` Wrote test coverage for removing disambiguation.
-  :bug:`5366`
 
 For packagers:
 
@@ -40,8 +38,9 @@ Other changes:
   possibly disabled musicbrainz plugin :bug:`6020`
 - Moved ``art.py`` utility module from ``beets`` into ``beetsplug`` namespace as
   it is not used in the core beets codebase. It can now be found in
-  ``beetsplug._utils``. - :class:`beets.metadata_plugin.MetadataSourcePlugin`:
-  Remove discogs specific disambiguation stripping
+  ``beetsplug._utils``.
+- :class:`beets.metadata_plugin.MetadataSourcePlugin`: Remove discogs specific
+  disambiguation stripping.
 
 2.4.0 (September 13, 2025)
 --------------------------
diff --git a/test/plugins/test_discogs.py b/test/plugins/test_discogs.py
index 5fe73dcac..92301380e 100644
--- a/test/plugins/test_discogs.py
+++ b/test/plugins/test_discogs.py
@@ -374,38 +374,26 @@ class DGAlbumInfoTest(BeetsTestCase):
         assert d.genre == "GENRE1, GENRE2"
         assert d.style is None
 
-    def test_strip_disambiguation_label_artist(self):
-        """Test removing discogs disambiguation from artist and label"""
+    def test_strip_disambiguation(self):
+        """Test removing disambiguation from all disambiguated fields."""
         data = {
             "id": 123,
             "uri": "https://www.discogs.com/release/123456-something",
-            "tracklist": [self._make_track("A", "1", "01:01")],
-            "artists": [{"name": "ARTIST NAME (2)", "id": 321, "join": ""}],
-            "title": "TITLE",
-            "labels": [
+            "tracklist": [
                 {
-                    "name": "LABEL NAME (5)",
-                    "catno": "CATALOG NUMBER",
+                    "title": "track",
+                    "position": "A",
+                    "type_": "track",
+                    "duration": "5:44",
+                    "artists": [
+                        {"name": "TEST ARTIST (5)", "tracks": "", "id": 11146}
+                    ],
                 }
             ],
-        }
-        release = Bag(
-            data=data,
-            title=data["title"],
-            artists=[Bag(data=d) for d in data["artists"]],
-        )
-        d = DiscogsPlugin().get_album_info(release)
-        assert d.artist == "ARTIST NAME"
-        assert d.label == "LABEL NAME"
-
-    def test_strip_disambiguation_off_label_artist(self):
-        """Test not removing discogs disambiguation from artist and label"""
-        config["discogs"]["strip_disambiguation"] = False
-        data = {
-            "id": 123,
-            "uri": "https://www.discogs.com/release/123456-something",
-            "tracklist": [self._make_track("a", "1", "01:01")],
-            "artists": [{"name": "ARTIST NAME (2)", "id": 321, "join": ""}],
+            "artists": [
+                {"name": "ARTIST NAME (2)", "id": 321, "join": "&"},
+                {"name": "OTHER ARTIST (5)", "id": 321, "join": ""},
+            ],
             "title": "title",
             "labels": [
                 {
@@ -420,30 +408,13 @@ class DGAlbumInfoTest(BeetsTestCase):
             artists=[Bag(data=d) for d in data["artists"]],
         )
         d = DiscogsPlugin().get_album_info(release)
-        assert d.artist == "ARTIST NAME (2)"
-        assert d.label == "LABEL NAME (5)"
-
-    def test_strip_disambiguation_multiple_artists(self):
-        """Test removing disambiguation if there are multiple artists on the release"""
-        data = {
-            "id": 123,
-            "uri": "https://www.discogs.com/release/123456-something",
-            "tracklist": [self._make_track("a", "1", "01:01")],
-            "artists": [
-                {"name": "ARTIST NAME (2)", "id": 321, "join": "&"},
-                {"name": "OTHER ARTIST (5)", "id": 321, "join": ""},
-            ],
-            "title": "title",
-        }
-        release = Bag(
-            data=data,
-            title=data["title"],
-            artists=[Bag(data=d) for d in data["artists"]],
-        )
-        d = DiscogsPlugin().get_album_info(release)
         assert d.artist == "ARTIST NAME & OTHER ARTIST"
+        assert d.tracks[0].artist == "TEST ARTIST"
+        assert d.label == "LABEL NAME"
 
-    def test_strip_disambiguation_artist_tracks(self):
+    def test_strip_disambiguation_false(self):
+        """Test disabling disambiguation removal from all disambiguated fields."""
+        config["discogs"]["strip_disambiguation"] = False
         data = {
             "id": 123,
             "uri": "https://www.discogs.com/release/123456-something",
@@ -454,16 +425,21 @@ class DGAlbumInfoTest(BeetsTestCase):
                     "type_": "track",
                     "duration": "5:44",
                     "artists": [
-                        {
-                            "name": "TEST ARTIST (5)",
-                            "tracks": "",
-                            "id": 11146,
-                        }
+                        {"name": "TEST ARTIST (5)", "tracks": "", "id": 11146}
                     ],
                 }
             ],
-            "artists": [{"name": "OTHER ARTIST (5)", "id": 321, "join": ""}],
+            "artists": [
+                {"name": "ARTIST NAME (2)", "id": 321, "join": "&"},
+                {"name": "OTHER ARTIST (5)", "id": 321, "join": ""},
+            ],
             "title": "title",
+            "labels": [
+                {
+                    "name": "LABEL NAME (5)",
+                    "catno": "catalog number",
+                }
+            ],
         }
         release = Bag(
             data=data,
@@ -471,8 +447,9 @@ class DGAlbumInfoTest(BeetsTestCase):
             artists=[Bag(data=d) for d in data["artists"]],
         )
         d = DiscogsPlugin().get_album_info(release)
-        assert d.tracks[0].artist == "TEST ARTIST"
-        assert d.artist == "OTHER ARTIST"
+        assert d.artist == "ARTIST NAME (2) & OTHER ARTIST (5)"
+        assert d.tracks[0].artist == "TEST ARTIST (5)"
+        assert d.label == "LABEL NAME (5)"
 
 
 @pytest.mark.parametrize(