diff --git a/.github/workflows/enos-run.yml b/.github/workflows/enos-run.yml
index 5494740cc..e8abb2e57 100644
--- a/.github/workflows/enos-run.yml
+++ b/.github/workflows/enos-run.yml
@@ -78,8 +78,8 @@ jobs:
         include:
           - filter: 'e2e_aws builder:crt'
           - filter: 'e2e_database'
-          - filter: 'e2e_static builder:crt'
-          - filter: 'e2e_static_with_vault builder:crt'
+          - filter: 'e2e_base builder:crt'
+          - filter: 'e2e_base_with_vault builder:crt'
           # - filter: 'e2e_ui builder:crt' # Don't run UI tests yet. takes too long.
     runs-on: ${{ fromJSON(vars.RUNNER) }}
     env:
@@ -182,7 +182,7 @@ jobs:
         run: |
           wget https://releases.hashicorp.com/vault/1.12.2/vault_1.12.2_linux_amd64.zip -O /tmp/test-deps/vault.zip
       - name: Install Vault CLI
-        if: matrix.filter == 'e2e_static_with_vault builder:crt' || matrix.filter == 'e2e_database' || matrix.filter == 'e2e_ui builder:crt' || matrix.filter == 'e2e_docker builder:crt'
+        if: matrix.filter == 'e2e_base_with_vault builder:crt' || matrix.filter == 'e2e_database' || matrix.filter == 'e2e_ui builder:crt' || matrix.filter == 'e2e_docker builder:crt'
         run: |
           unzip /tmp/test-deps/vault.zip -d /usr/local/bin
       - name: Add hosts to /etc/hosts
diff --git a/enos/enos-scenario-e2e-static-with-vault.hcl b/enos/enos-scenario-e2e-base-with-vault.hcl
similarity index 98%
rename from enos/enos-scenario-e2e-static-with-vault.hcl
rename to enos/enos-scenario-e2e-base-with-vault.hcl
index 0f22d850a..593297e0d 100644
--- a/enos/enos-scenario-e2e-static-with-vault.hcl
+++ b/enos/enos-scenario-e2e-base-with-vault.hcl
@@ -1,7 +1,7 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-scenario "e2e_static_with_vault" {
+scenario "e2e_base_with_vault" {
   terraform_cli = terraform_cli.default
   terraform     = terraform.default
   providers = [
@@ -144,7 +144,7 @@ scenario "e2e_static_with_vault" {
     ]
 
     variables {
-      test_package             = "github.com/hashicorp/boundary/testing/internal/e2e/tests/static_with_vault"
+      test_package             = "github.com/hashicorp/boundary/testing/internal/e2e/tests/base_with_vault"
       debug_no_run             = var.e2e_debug_no_run
       alb_boundary_api_addr    = step.create_boundary_cluster.alb_boundary_api_addr
       auth_method_id           = step.create_boundary_cluster.auth_method_id
diff --git a/enos/enos-scenario-e2e-static.hcl b/enos/enos-scenario-e2e-base.hcl
similarity index 98%
rename from enos/enos-scenario-e2e-static.hcl
rename to enos/enos-scenario-e2e-base.hcl
index d14650972..f23fbf9fb 100644
--- a/enos/enos-scenario-e2e-static.hcl
+++ b/enos/enos-scenario-e2e-base.hcl
@@ -1,7 +1,7 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-scenario "e2e_static" {
+scenario "e2e_base" {
   terraform_cli = terraform_cli.default
   terraform     = terraform.default
   providers = [
@@ -121,7 +121,7 @@ scenario "e2e_static" {
     ]
 
     variables {
-      test_package             = "github.com/hashicorp/boundary/testing/internal/e2e/tests/static"
+      test_package             = "github.com/hashicorp/boundary/testing/internal/e2e/tests/base"
       debug_no_run             = var.e2e_debug_no_run
       alb_boundary_api_addr    = step.create_boundary_cluster.alb_boundary_api_addr
       auth_method_id           = step.create_boundary_cluster.auth_method_id
diff --git a/enos/enos-scenario-e2e-docker.hcl b/enos/enos-scenario-e2e-docker.hcl
index 31ea39d39..b6fa87858 100644
--- a/enos/enos-scenario-e2e-docker.hcl
+++ b/enos/enos-scenario-e2e-docker.hcl
@@ -101,7 +101,7 @@ scenario "e2e_docker" {
     ]
 
     variables {
-      test_package             = "github.com/hashicorp/boundary/testing/internal/e2e/tests/static_with_vault"
+      test_package             = "github.com/hashicorp/boundary/testing/internal/e2e/tests/base_with_vault"
       debug_no_run             = var.e2e_debug_no_run
       alb_boundary_api_addr    = step.create_boundary.address
       auth_method_id           = step.create_boundary.auth_method_id
diff --git a/testing/internal/e2e/README.md b/testing/internal/e2e/README.md
index 1992146f1..c3aee2545 100644
--- a/testing/internal/e2e/README.md
+++ b/testing/internal/e2e/README.md
@@ -37,7 +37,7 @@ Set the appropriate environment variables...
 ```shell
 export E2E_TESTS=true  # This is needed for any e2e test. Otherwise, the test is skipped
 
-# For e2e/tests/static
+# For e2e/tests/base
 export BOUNDARY_ADDR=  # e.g. http://127.0.0.1:9200
 export E2E_PASSWORD_AUTH_METHOD_ID=  # e.g. ampw_1234567890
 export E2E_PASSWORD_ADMIN_LOGIN_NAME=  # e.g. "admin"
@@ -47,7 +47,7 @@ export E2E_TARGET_IP=  # e.g. 192.168.0.1
 export E2E_SSH_KEY_PATH=  # e.g. /Users/username/key.pem
 export E2E_SSH_USER=  # e.g. ubuntu
 
-# For e2e/tests/static_with_vault
+# For e2e/tests/base_with_vault
 export BOUNDARY_ADDR=  # e.g. http://127.0.0.1:9200
 export E2E_PASSWORD_AUTH_METHOD_ID=  # e.g. ampw_1234567890
 export E2E_PASSWORD_ADMIN_LOGIN_NAME=  # e.g. "admin"
@@ -84,10 +84,10 @@ export VAULT_TOKEN=
 
 Then, run...
 ```shell
-go test github.com/hashicorp/boundary/testing/internal/e2e/tests/static
+go test github.com/hashicorp/boundary/testing/internal/e2e/tests/base
 go test ./target/ // run target tests if running from this directory
-go test github.com/hashicorp/boundary/testing/internal/e2e/tests/static -v // verbose
-go test github.com/hashicorp/boundary/testing/internal/e2e/tests/static -v -run '^TestCreateTargetApi$' // run a specific test
+go test github.com/hashicorp/boundary/testing/internal/e2e/tests/base -v // verbose
+go test github.com/hashicorp/boundary/testing/internal/e2e/tests/base -v -run '^TestCreateTargetApi$' // run a specific test
 ```
 
 ## Adding Tests
diff --git a/testing/internal/e2e/tests/static/auth_token_delete_test.go b/testing/internal/e2e/tests/base/auth_token_delete_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/auth_token_delete_test.go
rename to testing/internal/e2e/tests/base/auth_token_delete_test.go
index 07d42e297..da27b3f23 100644
--- a/testing/internal/e2e/tests/static/auth_token_delete_test.go
+++ b/testing/internal/e2e/tests/base/auth_token_delete_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/authenticate_primary_test.go b/testing/internal/e2e/tests/base/authenticate_primary_test.go
similarity index 98%
rename from testing/internal/e2e/tests/static/authenticate_primary_test.go
rename to testing/internal/e2e/tests/base/authenticate_primary_test.go
index 82b92a21e..3d04b7a8c 100644
--- a/testing/internal/e2e/tests/static/authenticate_primary_test.go
+++ b/testing/internal/e2e/tests/base/authenticate_primary_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"bytes"
diff --git a/testing/internal/e2e/tests/static/bytes_up_down_empty_test.go b/testing/internal/e2e/tests/base/bytes_up_down_empty_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/bytes_up_down_empty_test.go
rename to testing/internal/e2e/tests/base/bytes_up_down_empty_test.go
index 9c5cb42f7..13303a6b1 100644
--- a/testing/internal/e2e/tests/static/bytes_up_down_empty_test.go
+++ b/testing/internal/e2e/tests/base/bytes_up_down_empty_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/bytes_up_down_test.go b/testing/internal/e2e/tests/base/bytes_up_down_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/bytes_up_down_test.go
rename to testing/internal/e2e/tests/base/bytes_up_down_test.go
index ff133a981..1db4649c3 100644
--- a/testing/internal/e2e/tests/static/bytes_up_down_test.go
+++ b/testing/internal/e2e/tests/base/bytes_up_down_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/connect_authz_token_test.go b/testing/internal/e2e/tests/base/connect_authz_token_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/connect_authz_token_test.go
rename to testing/internal/e2e/tests/base/connect_authz_token_test.go
index 90c2224c4..a5e1840be 100644
--- a/testing/internal/e2e/tests/static/connect_authz_token_test.go
+++ b/testing/internal/e2e/tests/base/connect_authz_token_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/connect_localhost_test.go b/testing/internal/e2e/tests/base/connect_localhost_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/connect_localhost_test.go
rename to testing/internal/e2e/tests/base/connect_localhost_test.go
index bcc4cba87..a2dfeb98c 100644
--- a/testing/internal/e2e/tests/static/connect_localhost_test.go
+++ b/testing/internal/e2e/tests/base/connect_localhost_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/connect_ssh_test.go b/testing/internal/e2e/tests/base/connect_ssh_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/connect_ssh_test.go
rename to testing/internal/e2e/tests/base/connect_ssh_test.go
index f09733ec5..308572bfc 100644
--- a/testing/internal/e2e/tests/static/connect_ssh_test.go
+++ b/testing/internal/e2e/tests/base/connect_ssh_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/connect_test.go b/testing/internal/e2e/tests/base/connect_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/connect_test.go
rename to testing/internal/e2e/tests/base/connect_test.go
index 1084b0b64..2eedb2522 100644
--- a/testing/internal/e2e/tests/static/connect_test.go
+++ b/testing/internal/e2e/tests/base/connect_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/credential_store_test.go b/testing/internal/e2e/tests/base/credential_store_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/credential_store_test.go
rename to testing/internal/e2e/tests/base/credential_store_test.go
index 7e4a80e8b..ffadc1387 100644
--- a/testing/internal/e2e/tests/static/credential_store_test.go
+++ b/testing/internal/e2e/tests/base/credential_store_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/env_test.go b/testing/internal/e2e/tests/base/env_test.go
similarity index 96%
rename from testing/internal/e2e/tests/static/env_test.go
rename to testing/internal/e2e/tests/base/env_test.go
index 49964079d..f3174ba33 100644
--- a/testing/internal/e2e/tests/static/env_test.go
+++ b/testing/internal/e2e/tests/base/env_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import "github.com/kelseyhightower/envconfig"
 
diff --git a/testing/internal/e2e/tests/static/key_destruction_test.go b/testing/internal/e2e/tests/base/key_destruction_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/key_destruction_test.go
rename to testing/internal/e2e/tests/base/key_destruction_test.go
index 804726dbe..ad863c592 100644
--- a/testing/internal/e2e/tests/static/key_destruction_test.go
+++ b/testing/internal/e2e/tests/base/key_destruction_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/session_cancel_admin_test.go b/testing/internal/e2e/tests/base/session_cancel_admin_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/session_cancel_admin_test.go
rename to testing/internal/e2e/tests/base/session_cancel_admin_test.go
index 39967bf0d..f99380761 100644
--- a/testing/internal/e2e/tests/static/session_cancel_admin_test.go
+++ b/testing/internal/e2e/tests/base/session_cancel_admin_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/session_cancel_group_test.go b/testing/internal/e2e/tests/base/session_cancel_group_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/session_cancel_group_test.go
rename to testing/internal/e2e/tests/base/session_cancel_group_test.go
index 3566f12ae..1a1ec1a18 100644
--- a/testing/internal/e2e/tests/static/session_cancel_group_test.go
+++ b/testing/internal/e2e/tests/base/session_cancel_group_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/session_cancel_user_test.go b/testing/internal/e2e/tests/base/session_cancel_user_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/session_cancel_user_test.go
rename to testing/internal/e2e/tests/base/session_cancel_user_test.go
index 37ddc3a9b..a60f2bd74 100644
--- a/testing/internal/e2e/tests/static/session_cancel_user_test.go
+++ b/testing/internal/e2e/tests/base/session_cancel_user_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/session_end_delete_host_set_test.go b/testing/internal/e2e/tests/base/session_end_delete_host_set_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/session_end_delete_host_set_test.go
rename to testing/internal/e2e/tests/base/session_end_delete_host_set_test.go
index 3b625f207..9095287f6 100644
--- a/testing/internal/e2e/tests/static/session_end_delete_host_set_test.go
+++ b/testing/internal/e2e/tests/base/session_end_delete_host_set_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/session_end_delete_host_test.go b/testing/internal/e2e/tests/base/session_end_delete_host_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/session_end_delete_host_test.go
rename to testing/internal/e2e/tests/base/session_end_delete_host_test.go
index 15bf4f1a8..46c87a6d6 100644
--- a/testing/internal/e2e/tests/static/session_end_delete_host_test.go
+++ b/testing/internal/e2e/tests/base/session_end_delete_host_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/session_end_delete_project_test.go b/testing/internal/e2e/tests/base/session_end_delete_project_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/session_end_delete_project_test.go
rename to testing/internal/e2e/tests/base/session_end_delete_project_test.go
index d2f88b64c..5b62c9a9d 100644
--- a/testing/internal/e2e/tests/static/session_end_delete_project_test.go
+++ b/testing/internal/e2e/tests/base/session_end_delete_project_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/session_end_delete_target_test.go b/testing/internal/e2e/tests/base/session_end_delete_target_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/session_end_delete_target_test.go
rename to testing/internal/e2e/tests/base/session_end_delete_target_test.go
index d6f238504..3e2dc6530 100644
--- a/testing/internal/e2e/tests/static/session_end_delete_target_test.go
+++ b/testing/internal/e2e/tests/base/session_end_delete_target_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/session_end_delete_user_test.go b/testing/internal/e2e/tests/base/session_end_delete_user_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/session_end_delete_user_test.go
rename to testing/internal/e2e/tests/base/session_end_delete_user_test.go
index 612eab529..19e470a49 100644
--- a/testing/internal/e2e/tests/static/session_end_delete_user_test.go
+++ b/testing/internal/e2e/tests/base/session_end_delete_user_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/target_address_test.go b/testing/internal/e2e/tests/base/target_address_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static/target_address_test.go
rename to testing/internal/e2e/tests/base/target_address_test.go
index ab2634eac..4bd34c775 100644
--- a/testing/internal/e2e/tests/static/target_address_test.go
+++ b/testing/internal/e2e/tests/base/target_address_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static/testdata/credential.json b/testing/internal/e2e/tests/base/testdata/credential.json
similarity index 100%
rename from testing/internal/e2e/tests/static/testdata/credential.json
rename to testing/internal/e2e/tests/base/testdata/credential.json
diff --git a/testing/internal/e2e/tests/static/version_test.go b/testing/internal/e2e/tests/base/version_test.go
similarity index 98%
rename from testing/internal/e2e/tests/static/version_test.go
rename to testing/internal/e2e/tests/base/version_test.go
index 36f10aebd..856781205 100644
--- a/testing/internal/e2e/tests/static/version_test.go
+++ b/testing/internal/e2e/tests/base/version_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_test
+package base_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static_with_vault/connect_authz_token_test.go b/testing/internal/e2e/tests/base_with_vault/connect_authz_token_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static_with_vault/connect_authz_token_test.go
rename to testing/internal/e2e/tests/base_with_vault/connect_authz_token_test.go
index 0b8e2a4b0..1f1a426b6 100644
--- a/testing/internal/e2e/tests/static_with_vault/connect_authz_token_test.go
+++ b/testing/internal/e2e/tests/base_with_vault/connect_authz_token_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_with_vault_test
+package base_with_vault_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static_with_vault/connect_ssh_test.go b/testing/internal/e2e/tests/base_with_vault/connect_ssh_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static_with_vault/connect_ssh_test.go
rename to testing/internal/e2e/tests/base_with_vault/connect_ssh_test.go
index eeaa933c8..f78f3f254 100644
--- a/testing/internal/e2e/tests/static_with_vault/connect_ssh_test.go
+++ b/testing/internal/e2e/tests/base_with_vault/connect_ssh_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_with_vault_test
+package base_with_vault_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static_with_vault/connect_test.go b/testing/internal/e2e/tests/base_with_vault/connect_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static_with_vault/connect_test.go
rename to testing/internal/e2e/tests/base_with_vault/connect_test.go
index 3a9022d6e..9a44b5ebf 100644
--- a/testing/internal/e2e/tests/static_with_vault/connect_test.go
+++ b/testing/internal/e2e/tests/base_with_vault/connect_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_with_vault_test
+package base_with_vault_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static_with_vault/credential_store_test.go b/testing/internal/e2e/tests/base_with_vault/credential_store_test.go
similarity index 99%
rename from testing/internal/e2e/tests/static_with_vault/credential_store_test.go
rename to testing/internal/e2e/tests/base_with_vault/credential_store_test.go
index afc3fd85f..c1cf84b4a 100644
--- a/testing/internal/e2e/tests/static_with_vault/credential_store_test.go
+++ b/testing/internal/e2e/tests/base_with_vault/credential_store_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_with_vault_test
+package base_with_vault_test
 
 import (
 	"context"
diff --git a/testing/internal/e2e/tests/static_with_vault/env_test.go b/testing/internal/e2e/tests/base_with_vault/env_test.go
similarity index 96%
rename from testing/internal/e2e/tests/static_with_vault/env_test.go
rename to testing/internal/e2e/tests/base_with_vault/env_test.go
index e8bef4497..e1f9370fe 100644
--- a/testing/internal/e2e/tests/static_with_vault/env_test.go
+++ b/testing/internal/e2e/tests/base_with_vault/env_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package static_with_vault_test
+package base_with_vault_test
 
 import "github.com/kelseyhightower/envconfig"
 
diff --git a/testing/internal/e2e/tests/static_with_vault/testdata/boundary-controller-policy.hcl b/testing/internal/e2e/tests/base_with_vault/testdata/boundary-controller-policy.hcl
similarity index 100%
rename from testing/internal/e2e/tests/static_with_vault/testdata/boundary-controller-policy.hcl
rename to testing/internal/e2e/tests/base_with_vault/testdata/boundary-controller-policy.hcl