diff --git a/testing/internal/e2e/boundary/scopes.go b/testing/internal/e2e/boundary/scope.go
similarity index 100%
rename from testing/internal/e2e/boundary/scopes.go
rename to testing/internal/e2e/boundary/scope.go
diff --git a/testing/internal/e2e/host/static/staticcredential_test.go b/testing/internal/e2e/host/static/connect_ssh_test.go
similarity index 100%
rename from testing/internal/e2e/host/static/staticcredential_test.go
rename to testing/internal/e2e/host/static/connect_ssh_test.go
diff --git a/testing/internal/e2e/host/static/statichost_test.go b/testing/internal/e2e/host/static/connect_test.go
similarity index 100%
rename from testing/internal/e2e/host/static/statichost_test.go
rename to testing/internal/e2e/host/static/connect_test.go
diff --git a/testing/internal/e2e/host/static/env.go b/testing/internal/e2e/host/static/env_test.go
similarity index 100%
rename from testing/internal/e2e/host/static/env.go
rename to testing/internal/e2e/host/static/env_test.go