diff --git a/agent/connect/ca/provider_consul.go b/agent/connect/ca/provider_consul.go
index c4141ed48b..8971d5cd99 100644
--- a/agent/connect/ca/provider_consul.go
+++ b/agent/connect/ca/provider_consul.go
@@ -623,9 +623,9 @@ func (c *ConsulProvider) generateCA(privateKey string, sn uint64) (string, error
 	serialNum := &big.Int{}
 	serialNum.SetUint64(sn)
 	template := x509.Certificate{
-		SerialNumber: serialNum,
-		Subject:      pkix.Name{CommonName: name},
-		URIs:         []*url.URL{id.URI()},
+		SerialNumber:          serialNum,
+		Subject:               pkix.Name{CommonName: name},
+		URIs:                  []*url.URL{id.URI()},
 		BasicConstraintsValid: true,
 		KeyUsage: x509.KeyUsageCertSign |
 			x509.KeyUsageCRLSign |
diff --git a/agent/connect/testing_ca.go b/agent/connect/testing_ca.go
index 67babf8664..27a0dd20a0 100644
--- a/agent/connect/testing_ca.go
+++ b/agent/connect/testing_ca.go
@@ -53,9 +53,9 @@ func TestCA(t testing.T, xc *structs.CARoot) *structs.CARoot {
 
 	// Create the CA cert
 	template := x509.Certificate{
-		SerialNumber: sn,
-		Subject:      pkix.Name{CommonName: result.Name},
-		URIs:         []*url.URL{id.URI()},
+		SerialNumber:          sn,
+		Subject:               pkix.Name{CommonName: result.Name},
+		URIs:                  []*url.URL{id.URI()},
 		BasicConstraintsValid: true,
 		KeyUsage: x509.KeyUsageCertSign |
 			x509.KeyUsageCRLSign |
diff --git a/agent/consul/state/prepared_query_test.go b/agent/consul/state/prepared_query_test.go
index 8a832bd884..44495819e3 100644
--- a/agent/consul/state/prepared_query_test.go
+++ b/agent/consul/state/prepared_query_test.go
@@ -11,8 +11,8 @@ import (
 
 func TestStateStore_PreparedQuery_isUUID(t *testing.T) {
 	cases := map[string]bool{
-		"":     false,
-		"nope": false,
+		"":                                      false,
+		"nope":                                  false,
 		"f004177f-2c28-83b7-4229-eacc25fe55d1":  true,
 		"F004177F-2C28-83B7-4229-EACC25FE55D1":  true,
 		"x004177f-2c28-83b7-4229-eacc25fe55d1":  false, // Bad hex
diff --git a/agent/structs/check_definition.go b/agent/structs/check_definition.go
index 42e9692fce..4252b4449d 100644
--- a/agent/structs/check_definition.go
+++ b/agent/structs/check_definition.go
@@ -64,21 +64,21 @@ func (c *CheckDefinition) CheckType() *CheckType {
 		Status:  c.Status,
 		Notes:   c.Notes,
 
-		ScriptArgs:        c.ScriptArgs,
-		AliasNode:         c.AliasNode,
-		AliasService:      c.AliasService,
-		HTTP:              c.HTTP,
-		GRPC:              c.GRPC,
-		GRPCUseTLS:        c.GRPCUseTLS,
-		Header:            c.Header,
-		Method:            c.Method,
-		TCP:               c.TCP,
-		Interval:          c.Interval,
-		DockerContainerID: c.DockerContainerID,
-		Shell:             c.Shell,
-		TLSSkipVerify:     c.TLSSkipVerify,
-		Timeout:           c.Timeout,
-		TTL:               c.TTL,
+		ScriptArgs:                     c.ScriptArgs,
+		AliasNode:                      c.AliasNode,
+		AliasService:                   c.AliasService,
+		HTTP:                           c.HTTP,
+		GRPC:                           c.GRPC,
+		GRPCUseTLS:                     c.GRPCUseTLS,
+		Header:                         c.Header,
+		Method:                         c.Method,
+		TCP:                            c.TCP,
+		Interval:                       c.Interval,
+		DockerContainerID:              c.DockerContainerID,
+		Shell:                          c.Shell,
+		TLSSkipVerify:                  c.TLSSkipVerify,
+		Timeout:                        c.Timeout,
+		TTL:                            c.TTL,
 		DeregisterCriticalServiceAfter: c.DeregisterCriticalServiceAfter,
 	}
 }
diff --git a/agent/structs/check_definition_test.go b/agent/structs/check_definition_test.go
index af240aa956..928a400bdd 100644
--- a/agent/structs/check_definition_test.go
+++ b/agent/structs/check_definition_test.go
@@ -81,17 +81,17 @@ func TestCheckDefinitionToCheckType(t *testing.T) {
 		Status: "green",
 		Notes:  "notes",
 
-		ServiceID:         "svcid",
-		Token:             "tok",
-		ScriptArgs:        []string{"/bin/foo"},
-		HTTP:              "someurl",
-		TCP:               "host:port",
-		Interval:          1 * time.Second,
-		DockerContainerID: "abc123",
-		Shell:             "/bin/ksh",
-		TLSSkipVerify:     true,
-		Timeout:           2 * time.Second,
-		TTL:               3 * time.Second,
+		ServiceID:                      "svcid",
+		Token:                          "tok",
+		ScriptArgs:                     []string{"/bin/foo"},
+		HTTP:                           "someurl",
+		TCP:                            "host:port",
+		Interval:                       1 * time.Second,
+		DockerContainerID:              "abc123",
+		Shell:                          "/bin/ksh",
+		TLSSkipVerify:                  true,
+		Timeout:                        2 * time.Second,
+		TTL:                            3 * time.Second,
 		DeregisterCriticalServiceAfter: 4 * time.Second,
 	}
 	want := &CheckType{
@@ -100,15 +100,15 @@ func TestCheckDefinitionToCheckType(t *testing.T) {
 		Status:  "green",
 		Notes:   "notes",
 
-		ScriptArgs:        []string{"/bin/foo"},
-		HTTP:              "someurl",
-		TCP:               "host:port",
-		Interval:          1 * time.Second,
-		DockerContainerID: "abc123",
-		Shell:             "/bin/ksh",
-		TLSSkipVerify:     true,
-		Timeout:           2 * time.Second,
-		TTL:               3 * time.Second,
+		ScriptArgs:                     []string{"/bin/foo"},
+		HTTP:                           "someurl",
+		TCP:                            "host:port",
+		Interval:                       1 * time.Second,
+		DockerContainerID:              "abc123",
+		Shell:                          "/bin/ksh",
+		TLSSkipVerify:                  true,
+		Timeout:                        2 * time.Second,
+		TTL:                            3 * time.Second,
 		DeregisterCriticalServiceAfter: 4 * time.Second,
 	}
 	verify.Values(t, "", got.CheckType(), want)