diff --git a/backend/remote-state/s3/backend_test.go b/backend/remote-state/s3/backend_test.go
index e296cdc42..ae6ca3475 100644
--- a/backend/remote-state/s3/backend_test.go
+++ b/backend/remote-state/s3/backend_test.go
@@ -257,8 +257,8 @@ func TestBackendPrefixInWorkspace(t *testing.T) {
 	bucketName := fmt.Sprintf("terraform-remote-s3-test-%x", time.Now().Unix())
 
 	b := backend.TestBackendConfig(t, New(), map[string]interface{}{
-		"bucket": bucketName,
-		"key":    "test-env.tfstate",
+		"bucket":               bucketName,
+		"key":                  "test-env.tfstate",
 		"workspace_key_prefix": "env",
 	}).(*Backend)
 
diff --git a/builtin/provisioners/chef/linux_provisioner_test.go b/builtin/provisioners/chef/linux_provisioner_test.go
index aa5b93d1d..d6fa7ab8d 100644
--- a/builtin/provisioners/chef/linux_provisioner_test.go
+++ b/builtin/provisioners/chef/linux_provisioner_test.go
@@ -121,7 +121,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
 			Commands: map[string]bool{
 				"curl -LO https://omnitruck.chef.io/install.sh": true,
 				"bash ./install.sh -v \"11.18.6\" -c stable":    true,
-				"rm -f install.sh":                              true,
+				"rm -f install.sh": true,
 			},
 		},
 
@@ -140,7 +140,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
 			Commands: map[string]bool{
 				"curl -LO https://omnitruck.chef.io/install.sh": true,
 				"bash ./install.sh -v \"11.18.6\" -c current":   true,
-				"rm -f install.sh":                              true,
+				"rm -f install.sh": true,
 			},
 		},
 	}
diff --git a/command/init.go b/command/init.go
index c831566d9..ecc459091 100644
--- a/command/init.go
+++ b/command/init.go
@@ -72,8 +72,8 @@ func (c *InitCommand) Run(args []string) int {
 	// set providerInstaller if we don't have a test version already
 	if c.providerInstaller == nil {
 		c.providerInstaller = &discovery.ProviderInstaller{
-			Dir:   c.pluginDir(),
-			Cache: c.pluginCache(),
+			Dir:                   c.pluginDir(),
+			Cache:                 c.pluginCache(),
 			PluginProtocolVersion: plugin.Handshake.ProtocolVersion,
 			SkipVerify:            !flagVerifyPlugins,
 			Ui:                    c.Ui,
diff --git a/command/meta_backend_test.go b/command/meta_backend_test.go
index 701403a05..871ba5ce5 100644
--- a/command/meta_backend_test.go
+++ b/command/meta_backend_test.go
@@ -1434,7 +1434,7 @@ func TestMetaBackend_configuredChangeCopy_multiToNoDefaultWithDefault(t *testing
 	// Ask input
 	defer testInputMap(t, map[string]string{
 		"backend-migrate-multistate-to-multistate": "yes",
-		"new-state-name":                           "env1",
+		"new-state-name": "env1",
 	})()
 
 	// Setup the meta
diff --git a/helper/schema/resource_timeout_test.go b/helper/schema/resource_timeout_test.go
index ad036600b..bef98071b 100644
--- a/helper/schema/resource_timeout_test.go
+++ b/helper/schema/resource_timeout_test.go
@@ -23,28 +23,28 @@ func TestResourceTimeout_ConfigDecode_badkey(t *testing.T) {
 		ShouldErr bool
 	}{
 		{
-			Name: "Source does not define 'delete' key",
+			Name:                   "Source does not define 'delete' key",
 			ResourceDefaultTimeout: timeoutForValues(10, 0, 5, 0, 0),
 			Config:                 expectedConfigForValues(2, 0, 0, 1, 0),
 			Expected:               timeoutForValues(10, 0, 5, 0, 0),
 			ShouldErr:              true,
 		},
 		{
-			Name: "Config overrides create",
+			Name:                   "Config overrides create",
 			ResourceDefaultTimeout: timeoutForValues(10, 0, 5, 0, 0),
 			Config:                 expectedConfigForValues(2, 0, 7, 0, 0),
 			Expected:               timeoutForValues(2, 0, 7, 0, 0),
 			ShouldErr:              false,
 		},
 		{
-			Name: "Config overrides create, default provided. Should still have zero values",
+			Name:                   "Config overrides create, default provided. Should still have zero values",
 			ResourceDefaultTimeout: timeoutForValues(10, 0, 5, 0, 3),
 			Config:                 expectedConfigForValues(2, 0, 7, 0, 0),
 			Expected:               timeoutForValues(2, 0, 7, 0, 3),
 			ShouldErr:              false,
 		},
 		{
-			Name: "Use something besides 'minutes'",
+			Name:                   "Use something besides 'minutes'",
 			ResourceDefaultTimeout: timeoutForValues(10, 0, 5, 0, 3),
 			Config: []map[string]interface{}{
 				map[string]interface{}{
diff --git a/helper/schema/schema_test.go b/helper/schema/schema_test.go
index 820352aea..6863482a4 100644
--- a/helper/schema/schema_test.go
+++ b/helper/schema/schema_test.go
@@ -2056,7 +2056,7 @@ func TestSchemaMap_Diff(t *testing.T) {
 
 			State: &terraform.InstanceState{
 				Attributes: map[string]string{
-					"block_device.#":                                "2",
+					"block_device.#": "2",
 					"block_device.616397234.delete_on_termination":  "true",
 					"block_device.616397234.device_name":            "/dev/sda1",
 					"block_device.2801811477.delete_on_termination": "true",
diff --git a/plugin/discovery/get_test.go b/plugin/discovery/get_test.go
index 65b2497aa..1f123e142 100644
--- a/plugin/discovery/get_test.go
+++ b/plugin/discovery/get_test.go
@@ -148,7 +148,7 @@ func TestProviderInstallerGet(t *testing.T) {
 
 	// attempt to use an incompatible protocol version
 	i := &ProviderInstaller{
-		Dir: tmpDir,
+		Dir:                   tmpDir,
 		PluginProtocolVersion: 5,
 		SkipVerify:            true,
 		Ui:                    cli.NewMockUi(),
@@ -159,7 +159,7 @@ func TestProviderInstallerGet(t *testing.T) {
 	}
 
 	i = &ProviderInstaller{
-		Dir: tmpDir,
+		Dir:                   tmpDir,
 		PluginProtocolVersion: 3,
 		SkipVerify:            true,
 		Ui:                    cli.NewMockUi(),
@@ -231,7 +231,7 @@ func TestProviderInstallerPurgeUnused(t *testing.T) {
 	f.Close()
 
 	i := &ProviderInstaller{
-		Dir: tmpDir,
+		Dir:                   tmpDir,
 		PluginProtocolVersion: 3,
 		SkipVerify:            true,
 		Ui:                    cli.NewMockUi(),