diff --git a/authority/authorize_test.go b/authority/authorize_test.go
index 350d5ef2..eb6d5fb6 100644
--- a/authority/authorize_test.go
+++ b/authority/authorize_test.go
@@ -19,27 +19,27 @@ func TestMatchesOne(t *testing.T) {
 		exp  bool
 	}
 	tests := map[string]matchesTest{
-		"false arg1 empty": matchesTest{
+		"false arg1 empty": {
 			a:   []string{},
 			b:   []string{"https://127.0.0.1:0/sign", "https://test.ca.smallstep.com/sign"},
 			exp: false,
 		},
-		"false arg2 empty": matchesTest{
+		"false arg2 empty": {
 			a:   []string{"https://127.0.0.1:0/sign", "https://test.ca.smallstep.com/sign"},
 			b:   []string{},
 			exp: false,
 		},
-		"false arg1,arg2 empty": matchesTest{
+		"false arg1,arg2 empty": {
 			a:   []string{"https://127.0.0.1:0/sign", "https://test.ca.smallstep.com/sign"},
 			b:   []string{"step-gateway", "step-cli"},
 			exp: false,
 		},
-		"false": matchesTest{
+		"false": {
 			a:   []string{"step-gateway", "step-cli"},
 			b:   []string{"https://127.0.0.1:0/sign", "https://test.ca.smallstep.com/sign"},
 			exp: false,
 		},
-		"true": matchesTest{
+		"true": {
 			a:   []string{"step-gateway", "https://test.ca.smallstep.com/sign"},
 			b:   []string{"https://127.0.0.1:0/sign", "https://test.ca.smallstep.com/sign"},
 			exp: true,
diff --git a/authority/tls.go b/authority/tls.go
index 554e9478..e7267f6b 100644
--- a/authority/tls.go
+++ b/authority/tls.go
@@ -195,15 +195,15 @@ func (a *Authority) Renew(ocx *x509.Certificate) (*x509.Certificate, *x509.Certi
 		ExtKeyUsage:                 oldCert.ExtKeyUsage,
 		UnknownExtKeyUsage:          oldCert.UnknownExtKeyUsage,
 		BasicConstraintsValid:       oldCert.BasicConstraintsValid,
-		IsCA:                  oldCert.IsCA,
-		MaxPathLen:            oldCert.MaxPathLen,
-		MaxPathLenZero:        oldCert.MaxPathLenZero,
-		OCSPServer:            oldCert.OCSPServer,
-		IssuingCertificateURL: oldCert.IssuingCertificateURL,
-		DNSNames:              oldCert.DNSNames,
-		EmailAddresses:        oldCert.EmailAddresses,
-		IPAddresses:           oldCert.IPAddresses,
-		URIs:                  oldCert.URIs,
+		IsCA:                        oldCert.IsCA,
+		MaxPathLen:                  oldCert.MaxPathLen,
+		MaxPathLenZero:              oldCert.MaxPathLenZero,
+		OCSPServer:                  oldCert.OCSPServer,
+		IssuingCertificateURL:       oldCert.IssuingCertificateURL,
+		DNSNames:                    oldCert.DNSNames,
+		EmailAddresses:              oldCert.EmailAddresses,
+		IPAddresses:                 oldCert.IPAddresses,
+		URIs:                        oldCert.URIs,
 		PermittedDNSDomainsCritical: oldCert.PermittedDNSDomainsCritical,
 		PermittedDNSDomains:         oldCert.PermittedDNSDomains,
 		ExcludedDNSDomains:          oldCert.ExcludedDNSDomains,