diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_authz_token_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_authz_token_test.go
index 7c8e95db0..905e06f5f 100644
--- a/testing/internal/e2e/tests/base/target_tcp_connect_authz_token_test.go
+++ b/testing/internal/e2e/tests/base/target_tcp_connect_authz_token_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TestCliConnectTargetWithAuthzToken uses the boundary cli to connect to a target using the
+// TestCliTcpTargetConnectTargetWithAuthzToken uses the boundary cli to connect to a target using the
 // `authz_token` option
 func TestCliTcpTargetConnectTargetWithAuthzToken(t *testing.T) {
 	e2e.MaybeSkipTest(t)
diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_ssh_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_ssh_test.go
index 868d03471..59c6ae6ff 100644
--- a/testing/internal/e2e/tests/base/target_tcp_connect_ssh_test.go
+++ b/testing/internal/e2e/tests/base/target_tcp_connect_ssh_test.go
@@ -16,10 +16,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TestCliConnectTargetWithSsh uses the boundary cli to create a credential using boundary's
+// TestCliTcpTargetConnectTargetWithSsh uses the boundary cli to create a credential using boundary's
 // built-in credential store. The test attaches that credential to a target and attempts to connect
 // to that target using those credentials.
-func TestCliConnectTargetWithSsh(t *testing.T) {
+func TestCliTcpTargetConnectTargetWithSsh(t *testing.T) {
 	e2e.MaybeSkipTest(t)
 	c, err := loadTestConfig()
 	require.NoError(t, err)
diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_test.go
index 442a835e0..896cc1c67 100644
--- a/testing/internal/e2e/tests/base/target_tcp_connect_test.go
+++ b/testing/internal/e2e/tests/base/target_tcp_connect_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/hashicorp/boundary/testing/internal/e2e/boundary"
 )
 
-// TestCliConnectTargetBasic uses the boundary cli to create a number of
+// TestCliTcpTargetConnectTargetBasic uses the boundary cli to create a number of
 // supporting objects to connect to a target. It then attempts to connect to
 // that target and verifies that the connection was successful.
 func TestCliTcpTargetConnectTargetBasic(t *testing.T) {
diff --git a/testing/internal/e2e/tests/base_with_vault/connect_authz_token_test.go b/testing/internal/e2e/tests/base_with_vault/target_tcp_connect_authz_token_test.go
similarity index 97%
rename from testing/internal/e2e/tests/base_with_vault/connect_authz_token_test.go
rename to testing/internal/e2e/tests/base_with_vault/target_tcp_connect_authz_token_test.go
index e5df4a24c..21c376de4 100644
--- a/testing/internal/e2e/tests/base_with_vault/connect_authz_token_test.go
+++ b/testing/internal/e2e/tests/base_with_vault/target_tcp_connect_authz_token_test.go
@@ -19,11 +19,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TestCliVaultConnectTargetWithAuthzToken uses the boundary and vault clis to add secrets
+// TestCliTcpTargetVaultConnectTargetWithAuthzToken uses the boundary and vault clis to add secrets
 // management for a target. The test sets up vault as a credential store, creates a set of
 // credentials in vault to be attached to a target, and attempts to connect to that target (with the
 // authz-token option) using those credentials.
-func TestCliVaultConnectTargetWithAuthzToken(t *testing.T) {
+func TestCliTcpTargetVaultConnectTargetWithAuthzToken(t *testing.T) {
 	e2e.MaybeSkipTest(t)
 	c, err := loadTestConfig()
 	require.NoError(t, err)
diff --git a/testing/internal/e2e/tests/base_with_vault/connect_ssh_test.go b/testing/internal/e2e/tests/base_with_vault/target_tcp_connect_ssh_test.go
similarity index 100%
rename from testing/internal/e2e/tests/base_with_vault/connect_ssh_test.go
rename to testing/internal/e2e/tests/base_with_vault/target_tcp_connect_ssh_test.go
diff --git a/testing/internal/e2e/tests/base_with_vault/connect_test.go b/testing/internal/e2e/tests/base_with_vault/target_tcp_connect_test.go
similarity index 97%
rename from testing/internal/e2e/tests/base_with_vault/connect_test.go
rename to testing/internal/e2e/tests/base_with_vault/target_tcp_connect_test.go
index 4b219c230..2079858ad 100644
--- a/testing/internal/e2e/tests/base_with_vault/connect_test.go
+++ b/testing/internal/e2e/tests/base_with_vault/target_tcp_connect_test.go
@@ -20,11 +20,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TestCliVaultConnectTarget uses the boundary and vault clis to add secrets management
+// TestCliTcpTargetVaultConnectTarget uses the boundary and vault clis to add secrets management
 // for a target. The test sets up vault as a credential store, creates a set of credentials
 // in vault to be attached to a target, and attempts to connect to that target using those
 // credentials.
-func TestCliVaultConnectTarget(t *testing.T) {
+func TestCliTcpTargetVaultConnectTarget(t *testing.T) {
 	e2e.MaybeSkipTest(t)
 	c, err := loadTestConfig()
 	require.NoError(t, err)