diff --git a/pkg/internal/testing/controlplane/apiserver.go b/pkg/internal/testing/controlplane/apiserver.go
index d6a71dc951..9ea4cd09bb 100644
--- a/pkg/internal/testing/controlplane/apiserver.go
+++ b/pkg/internal/testing/controlplane/apiserver.go
@@ -375,7 +375,11 @@ func (s *APIServer) populateAPIServerCerts() error {
 		return err
 	}
 
-	servingCerts, err := ca.NewServingCert()
+	certNames := []string{"localhost"}
+	if len(s.SecureServing.Address) > 0 {
+		certNames = append(certNames, s.SecureServing.Address)
+	}
+	servingCerts, err := ca.NewServingCert(certNames...)
 	if err != nil {
 		return err
 	}