diff --git a/pkg/minikube/tunnel/registry.go b/pkg/minikube/tunnel/registry.go
index dea5890343ad..374ab23124a8 100644
--- a/pkg/minikube/tunnel/registry.go
+++ b/pkg/minikube/tunnel/registry.go
@@ -87,9 +87,10 @@ func (r *persistentRegistry) Register(tunnel *ID) (rerr error) {
 
 	alreadyExists := false
 	for i, t := range tunnels {
-		// it is allowed for multiple minikube clusters to have multiple tunnels simultaneously
-		// it is possible that an old tunnel from an old profile has duplicated route information
-		// so we need to check both machine name and route information
+		// It is allowed for multiple minikube clusters to have multiple
+		// tunnels simultaneously. It is possible that an old tunnel
+		// from an old profile has duplicated route information so we
+		// need to check both machine name and route information.
 		if tunnel.MachineName == t.MachineName && t.Route.Equal(tunnel.Route) {
 			isRunning, err := checkIfRunning(t.Pid)
 			if err != nil {
diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md
index 3c017cc416f5..0d51d745b8da 100644
--- a/site/content/en/docs/contrib/tests.en.md
+++ b/site/content/en/docs/contrib/tests.en.md
@@ -112,7 +112,8 @@ asserts that there are no unexpected errors displayed in minikube command output
 are functionality tests which can safely share a profile in parallel
 
 ## TestFunctionalNewestKubernetes
-are functionality run functional tests using NewestKubernetesVersion
+are functionality run functional tests using
+NewestKubernetesVersion
 
 #### validateNodeLabels
 checks if minikube cluster is created with correct kubernetes's node label
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 5b47e6803230..1793206ee5a3 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -76,7 +76,8 @@ func TestFunctional(t *testing.T) {
 	testFunctional(t, "")
 }
 
-// TestFunctionalNewestKubernetes are functionality run functional tests using NewestKubernetesVersion
+// TestFunctionalNewestKubernetes are functionality run functional tests using
+// NewestKubernetesVersion
 func TestFunctionalNewestKubernetes(t *testing.T) {
 	if strings.Contains(*startArgs, "--kubernetes-version") || constants.NewestKubernetesVersion == constants.DefaultKubernetesVersion {
 		t.Skip()