diff --git a/tools/cache/shared_informer.go b/tools/cache/shared_informer.go
index 5f8c507f..f29a4b33 100644
--- a/tools/cache/shared_informer.go
+++ b/tools/cache/shared_informer.go
@@ -86,7 +86,7 @@ func NewSharedIndexInformer(lw ListerWatcher, objType runtime.Object, defaultEve
 		resyncCheckPeriod:               defaultEventHandlerResyncPeriod,
 		defaultEventHandlerResyncPeriod: defaultEventHandlerResyncPeriod,
 		cacheMutationDetector:           NewCacheMutationDetector(fmt.Sprintf("%T", objType)),
-		clock: realClock,
+		clock:                           realClock,
 	}
 	return sharedIndexInformer
 }
diff --git a/tools/clientcmd/client_config_test.go b/tools/clientcmd/client_config_test.go
index 21a7d322..798aa3dd 100644
--- a/tools/clientcmd/client_config_test.go
+++ b/tools/clientcmd/client_config_test.go
@@ -243,7 +243,7 @@ func TestCertificateData(t *testing.T) {
 
 	config := clientcmdapi.NewConfig()
 	config.Clusters["clean"] = &clientcmdapi.Cluster{
-		Server: "https://localhost:8443",
+		Server:                   "https://localhost:8443",
 		CertificateAuthorityData: caData,
 	}
 	config.AuthInfos["clean"] = &clientcmdapi.AuthInfo{
diff --git a/transport/round_trippers_test.go b/transport/round_trippers_test.go
index 74d3dc21..abe5ab53 100644
--- a/transport/round_trippers_test.go
+++ b/transport/round_trippers_test.go
@@ -135,7 +135,7 @@ func TestImpersonationRoundTripper(t *testing.T) {
 				},
 			},
 			expected: map[string][]string{
-				ImpersonateUserHeader:                                               {"user"},
+				ImpersonateUserHeader: {"user"},
 				ImpersonateUserExtraHeaderPrefix + `Test.example.com%2fthing.thing`: {"A", "a"},
 			},
 		},
@@ -219,11 +219,11 @@ func TestAuthProxyRoundTripper(t *testing.T) {
 			username: "user",
 			groups:   []string{"groupA", "groupB"},
 			extra: map[string][]string{
-				"one": {"alpha", "bravo"},
+				"one":                     {"alpha", "bravo"},
 				"example.com/two%20three": {"charlie", "delta"},
 			},
 			expectedExtra: map[string][]string{
-				"one": {"alpha", "bravo"},
+				"one":                         {"alpha", "bravo"},
 				"example.com%2ftwo%2520three": {"charlie", "delta"},
 			},
 		},
diff --git a/util/cert/cert.go b/util/cert/cert.go
index d9fb18e9..0e160dab 100644
--- a/util/cert/cert.go
+++ b/util/cert/cert.go
@@ -77,7 +77,7 @@ func NewSelfSignedCACert(cfg Config, key crypto.Signer) (*x509.Certificate, erro
 		NotAfter:              now.Add(duration365d * 10).UTC(),
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
 		BasicConstraintsValid: true,
-		IsCA: true,
+		IsCA:                  true,
 	}
 
 	certDERBytes, err := x509.CreateCertificate(cryptorand.Reader, &tmpl, &tmpl, key.Public(), key)
@@ -188,7 +188,7 @@ func GenerateSelfSignedCertKeyWithFixtures(host string, alternateIPs []net.IP, a
 
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
 		BasicConstraintsValid: true,
-		IsCA: true,
+		IsCA:                  true,
 	}
 
 	caDERBytes, err := x509.CreateCertificate(cryptorand.Reader, &caTemplate, &caTemplate, &caKey.PublicKey, caKey)