diff --git a/pkg/api/authn_test.go b/pkg/api/authn_test.go
index e57b6480..cc25200c 100644
--- a/pkg/api/authn_test.go
+++ b/pkg/api/authn_test.go
@@ -959,6 +959,8 @@ func TestCookiestoreCleanup(t *testing.T) {
 	log := log.NewTestLogger()
 	metrics := monitoring.NewMetricsServer(true, log)
 
+	defer metrics.Stop() // Clean up metrics server to prevent resource leaks
+
 	authCfgTestCases := []struct {
 		name string
 		cfg  config.AuthConfig
diff --git a/pkg/extensions/sync/sync_internal_test.go b/pkg/extensions/sync/sync_internal_test.go
index 60b33e42..68692939 100644
--- a/pkg/extensions/sync/sync_internal_test.go
+++ b/pkg/extensions/sync/sync_internal_test.go
@@ -586,6 +586,7 @@ func TestDestinationRegistry(t *testing.T) {
 
 		log := log.NewTestLogger()
 		metrics := monitoring.NewMetricsServer(false, log)
+		defer metrics.Stop() // Clean up metrics server to prevent resource leaks
 		cacheDriver, _ := storage.Create("boltdb", cache.BoltDBDriverParameters{
 			RootDir:     dir,
 			Name:        "cache",
diff --git a/pkg/meta/hooks_test.go b/pkg/meta/hooks_test.go
index fefcc5ee..2e3c1d92 100644
--- a/pkg/meta/hooks_test.go
+++ b/pkg/meta/hooks_test.go
@@ -26,6 +26,8 @@ func TestOnUpdateManifest(t *testing.T) {
 		storeController := storage.StoreController{}
 		log := log.NewTestLogger()
 		metrics := monitoring.NewMetricsServer(false, log)
+
+		defer metrics.Stop() // Clean up metrics server to prevent resource leaks
 		storeController.DefaultStore = local.NewImageStore(rootDir, true, true, log, metrics, nil, nil, nil, nil)
 
 		params := boltdb.DBParameters{
diff --git a/pkg/storage/common/common_test.go b/pkg/storage/common/common_test.go
index dcaff99c..989222b3 100644
--- a/pkg/storage/common/common_test.go
+++ b/pkg/storage/common/common_test.go
@@ -31,6 +31,8 @@ func TestValidateManifest(t *testing.T) {
 
 		log := log.NewTestLogger()
 		metrics := monitoring.NewMetricsServer(false, log)
+
+		defer metrics.Stop() // Clean up metrics server to prevent resource leaks
 		cacheDriver, _ := storage.Create("boltdb", cache.BoltDBDriverParameters{
 			RootDir:     dir,
 			Name:        "cache",
@@ -192,6 +194,8 @@ func TestGetReferrersErrors(t *testing.T) {
 
 		log := log.NewTestLogger()
 		metrics := monitoring.NewMetricsServer(false, log)
+
+		defer metrics.Stop() // Clean up metrics server to prevent resource leaks
 		cacheDriver, _ := storage.Create("boltdb", cache.BoltDBDriverParameters{
 			RootDir:     dir,
 			Name:        "cache",
@@ -410,6 +414,8 @@ func TestGetBlobDescriptorFromRepo(t *testing.T) {
 	log := log.NewTestLogger()
 	metrics := monitoring.NewMetricsServer(false, log)
 
+	defer metrics.Stop() // Clean up metrics server to prevent resource leaks
+
 	tdir := t.TempDir()
 	cacheDriver, _ := storage.Create("boltdb", cache.BoltDBDriverParameters{
 		RootDir:     tdir,
diff --git a/pkg/storage/gc/gc_internal_test.go b/pkg/storage/gc/gc_internal_test.go
index 8d9808ca..64f0952e 100644
--- a/pkg/storage/gc/gc_internal_test.go
+++ b/pkg/storage/gc/gc_internal_test.go
@@ -41,6 +41,7 @@ func TestGarbageCollectManifestErrors(t *testing.T) {
 		audit := zlog.NewAuditLogger("debug", "")
 
 		metrics := monitoring.NewMetricsServer(false, log)
+		defer metrics.Stop() // Clean up metrics server to prevent resource leaks
 
 		cacheDriver, _ := storage.Create("boltdb", cache.BoltDBDriverParameters{
 			RootDir:     dir,
@@ -166,6 +167,7 @@ func TestGarbageCollectIndexErrors(t *testing.T) {
 		audit := zlog.NewAuditLogger("debug", "")
 
 		metrics := monitoring.NewMetricsServer(false, log)
+		defer metrics.Stop() // Clean up metrics server to prevent resource leaks
 		cacheDriver, _ := storage.Create("boltdb", cache.BoltDBDriverParameters{
 			RootDir:     dir,
 			Name:        "cache",
diff --git a/pkg/storage/scrub_test.go b/pkg/storage/scrub_test.go
index 44364a5b..78de961b 100644
--- a/pkg/storage/scrub_test.go
+++ b/pkg/storage/scrub_test.go
@@ -44,6 +44,8 @@ func TestLocalCheckAllBlobsIntegrity(t *testing.T) {
 		tdir := t.TempDir()
 		log := log.NewTestLogger()
 		metrics := monitoring.NewMetricsServer(false, log)
+
+		defer metrics.Stop() // Clean up metrics server to prevent resource leaks
 		cacheDriver, _ := storage.Create("boltdb", cache.BoltDBDriverParameters{
 			RootDir:     tdir,
 			Name:        "cache",