diff --git a/command/catalog/list/dc/catalog_list_datacenters_test.go b/command/catalog/list/dc/catalog_list_datacenters_test.go
index 676ccd501..39cdea711 100644
--- a/command/catalog/list/dc/catalog_list_datacenters_test.go
+++ b/command/catalog/list/dc/catalog_list_datacenters_test.go
@@ -51,7 +51,7 @@ func TestCatalogListDatacentersCommand_Validation(t *testing.T) {
 	}
 }
 
-func TestCatalogListDatacentersCommand_Run(t *testing.T) {
+func TestCatalogListDatacentersCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/catalog/list/nodes/catalog_list_nodes_test.go b/command/catalog/list/nodes/catalog_list_nodes_test.go
index df683fd5b..abd8db63e 100644
--- a/command/catalog/list/nodes/catalog_list_nodes_test.go
+++ b/command/catalog/list/nodes/catalog_list_nodes_test.go
@@ -29,7 +29,7 @@ func TestCatalogListNodesCommand_Validation(t *testing.T) {
 	}
 }
 
-func TestCatalogListNodesCommand_Run(t *testing.T) {
+func TestCatalogListNodesCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/catalog/list/services/catalog_list_services_test.go b/command/catalog/list/services/catalog_list_services_test.go
index a0f3a8f13..14c9a3a32 100644
--- a/command/catalog/list/services/catalog_list_services_test.go
+++ b/command/catalog/list/services/catalog_list_services_test.go
@@ -30,7 +30,7 @@ func TestCatalogListServicesCommand_Validation(t *testing.T) {
 	}
 }
 
-func TestCatalogListServicesCommand_Run(t *testing.T) {
+func TestCatalogListServicesCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/event/event_test.go b/command/event/event_test.go
index d707caf82..4bc03bf53 100644
--- a/command/event/event_test.go
+++ b/command/event/event_test.go
@@ -14,7 +14,7 @@ func TestEventCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestEventCommandRun(t *testing.T) {
+func TestEventCommand(t *testing.T) {
 	t.Parallel()
 	a1 := agent.NewTestAgent(t.Name(), ``)
 	defer a1.Shutdown()
diff --git a/command/exec/exec_test.go b/command/exec/exec_test.go
index c477d94be..a7da1697f 100644
--- a/command/exec/exec_test.go
+++ b/command/exec/exec_test.go
@@ -17,7 +17,7 @@ func TestExecCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestExecCommandRun(t *testing.T) {
+func TestExecCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), `
 		disable_remote_exec = false
@@ -38,7 +38,7 @@ func TestExecCommandRun(t *testing.T) {
 	}
 }
 
-func TestExecCommandRun_NoShell(t *testing.T) {
+func TestExecCommand_NoShell(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), `
 		disable_remote_exec = false
@@ -59,7 +59,7 @@ func TestExecCommandRun_NoShell(t *testing.T) {
 	}
 }
 
-func TestExecCommandRun_CrossDC(t *testing.T) {
+func TestExecCommand_CrossDC(t *testing.T) {
 	t.Parallel()
 	a1 := agent.NewTestAgent(t.Name(), `
 		disable_remote_exec = false
diff --git a/command/forceleave/forceleave_test.go b/command/forceleave/forceleave_test.go
index 5d5a146e5..5291599a0 100644
--- a/command/forceleave/forceleave_test.go
+++ b/command/forceleave/forceleave_test.go
@@ -17,7 +17,7 @@ func TestForceLeaveCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestForceLeaveCommandRun(t *testing.T) {
+func TestForceLeaveCommand(t *testing.T) {
 	t.Parallel()
 	a1 := agent.NewTestAgent(t.Name(), ``)
 	a2 := agent.NewTestAgent(t.Name(), ``)
@@ -56,7 +56,7 @@ func TestForceLeaveCommandRun(t *testing.T) {
 	})
 }
 
-func TestForceLeaveCommandRun_noAddrs(t *testing.T) {
+func TestForceLeaveCommand_noAddrs(t *testing.T) {
 	t.Parallel()
 	ui := cli.NewMockUi()
 	c := New(ui)
diff --git a/command/info/info_test.go b/command/info/info_test.go
index b52c06ff7..acba8036b 100644
--- a/command/info/info_test.go
+++ b/command/info/info_test.go
@@ -14,7 +14,7 @@ func TestInfoCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestInfoCommandRun(t *testing.T) {
+func TestInfoCommand(t *testing.T) {
 	t.Parallel()
 	a1 := agent.NewTestAgent(t.Name(), ``)
 	defer a1.Shutdown()
diff --git a/command/join/join_test.go b/command/join/join_test.go
index 0abb59199..9c9ba3a4f 100644
--- a/command/join/join_test.go
+++ b/command/join/join_test.go
@@ -14,7 +14,7 @@ func TestJoinCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestJoinCommandJoinRun_lan(t *testing.T) {
+func TestJoinCommandJoin_lan(t *testing.T) {
 	t.Parallel()
 	a1 := agent.NewTestAgent(t.Name(), ``)
 	a2 := agent.NewTestAgent(t.Name(), ``)
@@ -38,7 +38,7 @@ func TestJoinCommandJoinRun_lan(t *testing.T) {
 	}
 }
 
-func TestJoinCommandRun_wan(t *testing.T) {
+func TestJoinCommand_wan(t *testing.T) {
 	t.Parallel()
 	a1 := agent.NewTestAgent(t.Name(), ``)
 	a2 := agent.NewTestAgent(t.Name(), ``)
@@ -63,7 +63,7 @@ func TestJoinCommandRun_wan(t *testing.T) {
 	}
 }
 
-func TestJoinCommandRun_noAddrs(t *testing.T) {
+func TestJoinCommand_noAddrs(t *testing.T) {
 	t.Parallel()
 	ui := cli.NewMockUi()
 	cmd := New(ui)
diff --git a/command/keyring/keyring_test.go b/command/keyring/keyring_test.go
index 9b01c4c59..a00963821 100644
--- a/command/keyring/keyring_test.go
+++ b/command/keyring/keyring_test.go
@@ -15,7 +15,7 @@ func TestKeyringCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestKeyringCommandRun(t *testing.T) {
+func TestKeyringCommand(t *testing.T) {
 	t.Parallel()
 	key1 := "HS5lJ+XuTlYKWaeGYyG+/A=="
 	key2 := "kZyFABeAmc64UMTrm9XuKA=="
@@ -66,7 +66,7 @@ func TestKeyringCommandRun(t *testing.T) {
 	}
 }
 
-func TestKeyringCommandRun_help(t *testing.T) {
+func TestKeyringCommand_help(t *testing.T) {
 	t.Parallel()
 	ui := cli.NewMockUi()
 	c := New(ui)
@@ -81,7 +81,7 @@ func TestKeyringCommandRun_help(t *testing.T) {
 	}
 }
 
-func TestKeyringCommandRun_failedConnection(t *testing.T) {
+func TestKeyringCommand_failedConnection(t *testing.T) {
 	t.Parallel()
 	ui := cli.NewMockUi()
 	c := New(ui)
@@ -95,7 +95,7 @@ func TestKeyringCommandRun_failedConnection(t *testing.T) {
 	}
 }
 
-func TestKeyringCommandRun_invalidRelayFactor(t *testing.T) {
+func TestKeyringCommand_invalidRelayFactor(t *testing.T) {
 	t.Parallel()
 	ui := cli.NewMockUi()
 	c := New(ui)
diff --git a/command/kv/del/kv_delete_test.go b/command/kv/del/kv_delete_test.go
index 10bb296c3..1beb32357 100644
--- a/command/kv/del/kv_delete_test.go
+++ b/command/kv/del/kv_delete_test.go
@@ -70,7 +70,7 @@ func TestKVDeleteCommand_Validation(t *testing.T) {
 	}
 }
 
-func TestKVDeleteCommand_Run(t *testing.T) {
+func TestKVDeleteCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/kv/exp/kv_export_test.go b/command/kv/exp/kv_export_test.go
index 5a8c6866a..fe9658cd2 100644
--- a/command/kv/exp/kv_export_test.go
+++ b/command/kv/exp/kv_export_test.go
@@ -19,7 +19,7 @@ func TestKVExportCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestKVExportCommand_Run(t *testing.T) {
+func TestKVExportCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/kv/get/kv_get_test.go b/command/kv/get/kv_get_test.go
index 1c170418c..6dd472c23 100644
--- a/command/kv/get/kv_get_test.go
+++ b/command/kv/get/kv_get_test.go
@@ -57,7 +57,7 @@ func TestKVGetCommand_Validation(t *testing.T) {
 	}
 }
 
-func TestKVGetCommand_Run(t *testing.T) {
+func TestKVGetCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/kv/imp/kv_import_test.go b/command/kv/imp/kv_import_test.go
index 31e0ffca6..973bfe026 100644
--- a/command/kv/imp/kv_import_test.go
+++ b/command/kv/imp/kv_import_test.go
@@ -15,7 +15,7 @@ func TestKVImportCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestKVImportCommand_Run(t *testing.T) {
+func TestKVImportCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/kv/put/kv_put_test.go b/command/kv/put/kv_put_test.go
index 2c21b704f..7af8601c8 100644
--- a/command/kv/put/kv_put_test.go
+++ b/command/kv/put/kv_put_test.go
@@ -75,7 +75,7 @@ func TestKVPutCommand_Validation(t *testing.T) {
 	}
 }
 
-func TestKVPutCommand_Run(t *testing.T) {
+func TestKVPutCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -104,7 +104,7 @@ func TestKVPutCommand_Run(t *testing.T) {
 	}
 }
 
-func TestKVPutCommand_RunEmptyDataQuoted(t *testing.T) {
+func TestKVPutCommand_EmptyDataQuoted(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -133,7 +133,7 @@ func TestKVPutCommand_RunEmptyDataQuoted(t *testing.T) {
 	}
 }
 
-func TestKVPutCommand_RunBase64(t *testing.T) {
+func TestKVPutCommand_Base64(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/leave/leave_test.go b/command/leave/leave_test.go
index 9e63bc511..ebb8132ed 100644
--- a/command/leave/leave_test.go
+++ b/command/leave/leave_test.go
@@ -15,7 +15,7 @@ func TestLeaveCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestLeaveCommandRun(t *testing.T) {
+func TestLeaveCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -34,7 +34,7 @@ func TestLeaveCommandRun(t *testing.T) {
 	}
 }
 
-func TestLeaveCommandFailOnNonFlagArgs(t *testing.T) {
+func TestLeaveCommand_FailOnNonFlagArgs(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/lock/lock_test.go b/command/lock/lock_test.go
index eec00eb13..41e6a9217 100644
--- a/command/lock/lock_test.go
+++ b/command/lock/lock_test.go
@@ -32,7 +32,7 @@ func TestLockCommand_BadArgs(t *testing.T) {
 	argFail(t, []string{"-monitor-retry=-5", "test/prefix", "date"}, "must be >= 0")
 }
 
-func TestLockCommand_Run(t *testing.T) {
+func TestLockCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -55,7 +55,7 @@ func TestLockCommand_Run(t *testing.T) {
 	}
 }
 
-func TestLockCommand_Run_NoShell(t *testing.T) {
+func TestLockCommand_NoShell(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -78,7 +78,7 @@ func TestLockCommand_Run_NoShell(t *testing.T) {
 	}
 }
 
-func TestLockCommand_Try_Lock(t *testing.T) {
+func TestLockCommand_TryLock(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -110,7 +110,7 @@ func TestLockCommand_Try_Lock(t *testing.T) {
 	}
 }
 
-func TestLockCommand_Try_Semaphore(t *testing.T) {
+func TestLockCommand_TrySemaphore(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/maint/maint_test.go b/command/maint/maint_test.go
index 34d28cff5..040397655 100644
--- a/command/maint/maint_test.go
+++ b/command/maint/maint_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/mitchellh/cli"
 )
 
-func TestMaintCommandRun_ConflictingArgs(t *testing.T) {
+func TestMaintCommand_ConflictingArgs(t *testing.T) {
 	t.Parallel()
 	ui := cli.NewMockUi()
 	c := New(ui)
@@ -32,7 +32,7 @@ func TestMaintCommandRun_ConflictingArgs(t *testing.T) {
 	}
 }
 
-func TestMaintCommandRun_NoArgs(t *testing.T) {
+func TestMaintCommand_NoArgs(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -81,7 +81,7 @@ func TestMaintCommandRun_NoArgs(t *testing.T) {
 	}
 }
 
-func TestMaintCommandRun_EnableNodeMaintenance(t *testing.T) {
+func TestMaintCommand_EnableNodeMaintenance(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -105,7 +105,7 @@ func TestMaintCommandRun_EnableNodeMaintenance(t *testing.T) {
 	}
 }
 
-func TestMaintCommandRun_DisableNodeMaintenance(t *testing.T) {
+func TestMaintCommand_DisableNodeMaintenance(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -128,7 +128,7 @@ func TestMaintCommandRun_DisableNodeMaintenance(t *testing.T) {
 	}
 }
 
-func TestMaintCommandRun_EnableServiceMaintenance(t *testing.T) {
+func TestMaintCommand_EnableServiceMaintenance(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -162,7 +162,7 @@ func TestMaintCommandRun_EnableServiceMaintenance(t *testing.T) {
 	}
 }
 
-func TestMaintCommandRun_DisableServiceMaintenance(t *testing.T) {
+func TestMaintCommand_DisableServiceMaintenance(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -195,7 +195,7 @@ func TestMaintCommandRun_DisableServiceMaintenance(t *testing.T) {
 	}
 }
 
-func TestMaintCommandRun_ServiceMaintenance_NoService(t *testing.T) {
+func TestMaintCommand_ServiceMaintenance_NoService(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/members/members_test.go b/command/members/members_test.go
index 9c1ff4cd8..a227bbbb1 100644
--- a/command/members/members_test.go
+++ b/command/members/members_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/mitchellh/cli"
 )
 
-func TestMembersCommandRun(t *testing.T) {
+func TestMembersCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -41,7 +41,7 @@ func TestMembersCommandRun(t *testing.T) {
 	}
 }
 
-func TestMembersCommandRun_WAN(t *testing.T) {
+func TestMembersCommand_WAN(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -62,7 +62,7 @@ func TestMembersCommandRun_WAN(t *testing.T) {
 	}
 }
 
-func TestMembersCommandRun_statusFilter(t *testing.T) {
+func TestMembersCommand_statusFilter(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
@@ -86,7 +86,7 @@ func TestMembersCommandRun_statusFilter(t *testing.T) {
 	}
 }
 
-func TestMembersCommandRun_statusFilter_failed(t *testing.T) {
+func TestMembersCommand_statusFilter_failed(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/operator/autopilot/get/operator_autopilot_get_test.go b/command/operator/autopilot/get/operator_autopilot_get_test.go
index cb93c8fcb..922957d07 100644
--- a/command/operator/autopilot/get/operator_autopilot_get_test.go
+++ b/command/operator/autopilot/get/operator_autopilot_get_test.go
@@ -8,14 +8,14 @@ import (
 	"github.com/mitchellh/cli"
 )
 
-func TestOperatorAutopilotGetCommand_noTabs(t *testing.T) {
+func TestOperatorAutopilotGetConfigCommand_noTabs(t *testing.T) {
 	t.Parallel()
 	if strings.ContainsRune(New(cli.NewMockUi()).Help(), '\t') {
 		t.Fatal("usage has tabs")
 	}
 }
 
-func TestOperator_Autopilot_Get(t *testing.T) {
+func TestOperatorAutopilotGetConfigCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/operator/autopilot/set/operator_autopilot_set_test.go b/command/operator/autopilot/set/operator_autopilot_set_test.go
index 18d44c9b6..acf169fdc 100644
--- a/command/operator/autopilot/set/operator_autopilot_set_test.go
+++ b/command/operator/autopilot/set/operator_autopilot_set_test.go
@@ -10,14 +10,14 @@ import (
 	"github.com/mitchellh/cli"
 )
 
-func TestOperatorAutopilotSetCommand_noTabs(t *testing.T) {
+func TestOperatorAutopilotSetConfigCommand_noTabs(t *testing.T) {
 	t.Parallel()
 	if strings.ContainsRune(New(cli.NewMockUi()).Help(), '\t') {
 		t.Fatal("usage has tabs")
 	}
 }
 
-func TestOperator_Autopilot_Set(t *testing.T) {
+func TestOperatorAutopilotSetConfigCommmand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/operator/raft/listpeers/operator_raft_list_test.go b/command/operator/raft/listpeers/operator_raft_list_test.go
index 8d3210981..b4adacc0e 100644
--- a/command/operator/raft/listpeers/operator_raft_list_test.go
+++ b/command/operator/raft/listpeers/operator_raft_list_test.go
@@ -16,7 +16,7 @@ func TestOperatorRaftListPeersCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestOperatorRaftListPeersCommandRun(t *testing.T) {
+func TestOperatorRaftListPeersCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/operator/raft/removepeer/operator_raft_remove_test.go b/command/operator/raft/removepeer/operator_raft_remove_test.go
index 212a2bebe..2aab3549f 100644
--- a/command/operator/raft/removepeer/operator_raft_remove_test.go
+++ b/command/operator/raft/removepeer/operator_raft_remove_test.go
@@ -15,7 +15,7 @@ func TestOperatorRaftRemovePeerCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestOperator_Raft_RemovePeer(t *testing.T) {
+func TestOperatorRaftRemovePeerCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/reload/reload_test.go b/command/reload/reload_test.go
index 9571d0082..93a9471ba 100644
--- a/command/reload/reload_test.go
+++ b/command/reload/reload_test.go
@@ -15,7 +15,7 @@ func TestReloadCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestReloadCommandRun(t *testing.T) {
+func TestReloadCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/rtt/rtt_test.go b/command/rtt/rtt_test.go
index bfd6baf55..b5fce6fac 100644
--- a/command/rtt/rtt_test.go
+++ b/command/rtt/rtt_test.go
@@ -19,7 +19,7 @@ func TestRTTCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestRTTCommand_Run_BadArgs(t *testing.T) {
+func TestRTTCommand_BadArgs(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
 		args []string
@@ -43,7 +43,7 @@ func TestRTTCommand_Run_BadArgs(t *testing.T) {
 	}
 }
 
-func TestRTTCommand_Run_LAN(t *testing.T) {
+func TestRTTCommand_LAN(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), `
 		consul = {
@@ -151,7 +151,7 @@ func TestRTTCommand_Run_LAN(t *testing.T) {
 	}
 }
 
-func TestRTTCommand_Run_WAN(t *testing.T) {
+func TestRTTCommand_WAN(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/snapshot/inspect/snapshot_inspect_test.go b/command/snapshot/inspect/snapshot_inspect_test.go
index 80d5d6a06..72258e7eb 100644
--- a/command/snapshot/inspect/snapshot_inspect_test.go
+++ b/command/snapshot/inspect/snapshot_inspect_test.go
@@ -59,7 +59,7 @@ func TestSnapshotInspectCommand_Validation(t *testing.T) {
 	}
 }
 
-func TestSnapshotInspectCommand_Run(t *testing.T) {
+func TestSnapshotInspectCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/snapshot/restore/snapshot_restore_test.go b/command/snapshot/restore/snapshot_restore_test.go
index e5a7a8bd9..4a4031d3e 100644
--- a/command/snapshot/restore/snapshot_restore_test.go
+++ b/command/snapshot/restore/snapshot_restore_test.go
@@ -59,7 +59,7 @@ func TestSnapshotRestoreCommand_Validation(t *testing.T) {
 	}
 }
 
-func TestSnapshotRestoreCommand_Run(t *testing.T) {
+func TestSnapshotRestoreCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/snapshot/save/snapshot_save_test.go b/command/snapshot/save/snapshot_save_test.go
index cedff08ab..4f04adae7 100644
--- a/command/snapshot/save/snapshot_save_test.go
+++ b/command/snapshot/save/snapshot_save_test.go
@@ -58,7 +58,7 @@ func TestSnapshotSaveCommand_Validation(t *testing.T) {
 	}
 }
 
-func TestSnapshotSaveCommand_Run(t *testing.T) {
+func TestSnapshotSaveCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
diff --git a/command/validate/validate_test.go b/command/validate/validate_test.go
index 7767e9201..9a94356f9 100644
--- a/command/validate/validate_test.go
+++ b/command/validate/validate_test.go
@@ -17,7 +17,7 @@ func TestValidateCommand_noTabs(t *testing.T) {
 	}
 }
 
-func TestValidateCommandFailOnEmptyFile(t *testing.T) {
+func TestValidateCommand_FailOnEmptyFile(t *testing.T) {
 	t.Parallel()
 	tmpFile := testutil.TempFile(t, "consul")
 	defer os.RemoveAll(tmpFile.Name())
@@ -30,7 +30,7 @@ func TestValidateCommandFailOnEmptyFile(t *testing.T) {
 	}
 }
 
-func TestValidateCommandSucceedOnMinimalConfigFile(t *testing.T) {
+func TestValidateCommand_SucceedOnMinimalConfigFile(t *testing.T) {
 	td := testutil.TempDir(t, "consul")
 	defer os.RemoveAll(td)
 
@@ -48,7 +48,7 @@ func TestValidateCommandSucceedOnMinimalConfigFile(t *testing.T) {
 	}
 }
 
-func TestValidateCommandSucceedOnMinimalConfigDir(t *testing.T) {
+func TestValidateCommand_SucceedOnMinimalConfigDir(t *testing.T) {
 	td := testutil.TempDir(t, "consul")
 	defer os.RemoveAll(td)
 
@@ -65,7 +65,7 @@ func TestValidateCommandSucceedOnMinimalConfigDir(t *testing.T) {
 	}
 }
 
-func TestValidateCommandQuiet(t *testing.T) {
+func TestValidateCommand_Quiet(t *testing.T) {
 	t.Parallel()
 	td := testutil.TempDir(t, "consul")
 	defer os.RemoveAll(td)
diff --git a/command/watch/watch_test.go b/command/watch/watch_test.go
index 1b5f02388..aede3ed36 100644
--- a/command/watch/watch_test.go
+++ b/command/watch/watch_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/mitchellh/cli"
 )
 
-func TestWatchCommandRun(t *testing.T) {
+func TestWatchCommand(t *testing.T) {
 	t.Parallel()
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()