diff --git a/kubechain/internal/controller/mcpserver/suite_test.go b/kubechain/internal/controller/mcpserver/suite_test.go
index b67cec1..959db1b 100644
--- a/kubechain/internal/controller/mcpserver/suite_test.go
+++ b/kubechain/internal/controller/mcpserver/suite_test.go
@@ -17,6 +17,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	kubechainv1alpha1 "github.com/humanlayer/smallchain/kubechain/api/v1alpha1"
 	// +kubebuilder:scaffold:imports
@@ -68,6 +69,9 @@ var _ = BeforeSuite(func() {
 
 	k8sManager, err := ctrl.NewManager(cfg, ctrl.Options{
 		Scheme: scheme.Scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: ":0", // Use port 0 to let the system assign a free port
+		},
 	})
 	Expect(err).ToNot(HaveOccurred())