diff --git a/core/extdata/export_test.go b/core/extdata/export_test.go
deleted file mode 100644
index bcf014c07..000000000
--- a/core/extdata/export_test.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package extdata
-
-// Expose internal types for testing
-type MockAgents = mockAgents
diff --git a/core/extdata/provider_helper_test.go b/core/extdata/extdata_helper_test.go
similarity index 99%
rename from core/extdata/provider_helper_test.go
rename to core/extdata/extdata_helper_test.go
index ef4d0de62..c2bda1ec5 100644
--- a/core/extdata/provider_helper_test.go
+++ b/core/extdata/extdata_helper_test.go
@@ -1,4 +1,4 @@
-package extdata
+package extdata_test
 
 import (
 	"context"
diff --git a/core/extdata/provider_albumimage_test.go b/core/extdata/provider_albumimage_test.go
index 04ce060fd..2a7f9611b 100644
--- a/core/extdata/provider_albumimage_test.go
+++ b/core/extdata/provider_albumimage_test.go
@@ -1,4 +1,4 @@
-package extdata
+package extdata_test
 
 import (
 	"context"
@@ -7,6 +7,7 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/core/agents"
+	. "github.com/navidrome/navidrome/core/extdata"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
 	. "github.com/onsi/ginkgo/v2"
diff --git a/core/extdata/provider_artistimage_test.go b/core/extdata/provider_artistimage_test.go
index 69b9c32e8..26a63f7fe 100644
--- a/core/extdata/provider_artistimage_test.go
+++ b/core/extdata/provider_artistimage_test.go
@@ -1,4 +1,4 @@
-package extdata
+package extdata_test
 
 import (
 	"context"
@@ -7,6 +7,7 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/core/agents"
+	. "github.com/navidrome/navidrome/core/extdata"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
 	. "github.com/onsi/ginkgo/v2"
diff --git a/core/extdata/provider_similarsongs_test.go b/core/extdata/provider_similarsongs_test.go
index 994551149..d4f381108 100644
--- a/core/extdata/provider_similarsongs_test.go
+++ b/core/extdata/provider_similarsongs_test.go
@@ -1,4 +1,4 @@
-package extdata
+package extdata_test
 
 import (
 	"context"
@@ -6,6 +6,7 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/core/agents"
+	. "github.com/navidrome/navidrome/core/extdata"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
 	. "github.com/onsi/ginkgo/v2"
diff --git a/core/extdata/provider_topsongs_test.go b/core/extdata/provider_topsongs_test.go
index 694b4d75c..9324d314e 100644
--- a/core/extdata/provider_topsongs_test.go
+++ b/core/extdata/provider_topsongs_test.go
@@ -1,4 +1,4 @@
-package extdata
+package extdata_test
 
 import (
 	"context"
@@ -9,6 +9,7 @@ import (
 	_ "github.com/navidrome/navidrome/core/agents/lastfm"
 	_ "github.com/navidrome/navidrome/core/agents/listenbrainz"
 	_ "github.com/navidrome/navidrome/core/agents/spotify"
+	. "github.com/navidrome/navidrome/core/extdata"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
 	. "github.com/onsi/ginkgo/v2"
@@ -21,7 +22,7 @@ var _ = Describe("Provider - TopSongs", func() {
 		p                    Provider
 		artistRepo           *mockArtistRepo    // From provider_helper_test.go
 		mediaFileRepo        *mockMediaFileRepo // From provider_helper_test.go
-		ag                   *MockAgents        // Consolidated mock from export_test.go
+		ag                   *mockAgents        // Consolidated mock from export_test.go
 		ctx                  context.Context
 		originalAgentsConfig string
 	)
@@ -39,7 +40,7 @@ var _ = Describe("Provider - TopSongs", func() {
 			MockedMediaFile: mediaFileRepo,
 		}
 
-		ag = new(MockAgents)
+		ag = new(mockAgents)
 
 		p = NewProvider(ds, ag)
 	})
diff --git a/core/extdata/provider_updatealbuminfo_test.go b/core/extdata/provider_updatealbuminfo_test.go
index bfa7a5345..df36b4e98 100644
--- a/core/extdata/provider_updatealbuminfo_test.go
+++ b/core/extdata/provider_updatealbuminfo_test.go
@@ -26,14 +26,14 @@ var _ = Describe("Provider UpdateAlbumInfo", func() {
 		ctx           context.Context
 		p             extdata.Provider
 		ds            *tests.MockDataStore
-		ag            *extdata.MockAgents
+		ag            *mockAgents
 		mockAlbumRepo *tests.MockAlbumRepo
 	)
 
 	BeforeEach(func() {
 		ctx = context.Background()
 		ds = new(tests.MockDataStore)
-		ag = new(extdata.MockAgents)
+		ag = new(mockAgents)
 		p = extdata.NewProvider(ds, ag)
 		mockAlbumRepo = ds.Album(ctx).(*tests.MockAlbumRepo)
 		conf.Server.DevAlbumInfoTimeToLive = 1 * time.Hour
diff --git a/core/extdata/provider_updateartistinfo_test.go b/core/extdata/provider_updateartistinfo_test.go
index afda3852c..70ea727f0 100644
--- a/core/extdata/provider_updateartistinfo_test.go
+++ b/core/extdata/provider_updateartistinfo_test.go
@@ -26,14 +26,14 @@ var _ = Describe("Provider UpdateArtistInfo", func() {
 		ctx            context.Context
 		p              extdata.Provider
 		ds             *tests.MockDataStore
-		ag             *extdata.MockAgents
+		ag             *mockAgents
 		mockArtistRepo *tests.MockArtistRepo
 	)
 
 	BeforeEach(func() {
 		ctx = context.Background()
 		ds = new(tests.MockDataStore)
-		ag = new(extdata.MockAgents)
+		ag = new(mockAgents)
 		p = extdata.NewProvider(ds, ag)
 		mockArtistRepo = ds.Artist(ctx).(*tests.MockArtistRepo)
 		conf.Server.DevArtistInfoTimeToLive = 1 * time.Hour