diff --git a/.github/actions/test-provider-tfe/action.yml b/.github/actions/test-provider-tfe/action.yml
index 416ec17a6..79fb9f4f9 100644
--- a/.github/actions/test-provider-tfe/action.yml
+++ b/.github/actions/test-provider-tfe/action.yml
@@ -87,7 +87,6 @@ runs:
         index: ${{ inputs.matrix_index }}
         total: ${{ inputs.matrix_total }}
         junit-summary: ./ci-summary-provider.xml
-        # When tests are split and run concurrently, lists_tests arg in ci.yml will skip the TestAccTFESAMLSettings_omnibus test suite
         list: ${{ inputs.list_tests }}
 
     - name: Run Tests
@@ -121,6 +120,6 @@ runs:
     - name: Upload test artifacts
       uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
       with:
-        name: junit-test-summary-${{ matrix.index }}
+        name: junit-${{ matrix.test_name }}-summary-${{ matrix.index }}
         path: summary.xml
         retention-days: 1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b4cf6778a..6d83802c2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,15 +17,90 @@ jobs:
       - uses: ./.github/actions/lint-provider-tfe
 
   tests:
-    name: run
+    name: tests
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 40
     strategy:
       fail-fast: false
       matrix:
-        # If you adjust these parameters, also adjust the jrm input files on the "Merge reports" step below
-        total: [ 1 ]
-        index: [ 0 ]
+        total: [5]
+        index: [0, 1, 2, 3, 4]
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Fetch Outputs
+        id: tflocal
+        uses: hashicorp-forge/terraform-cloud-action/outputs@5583d5f554d268ac91b3c37fd0a5e9da2c78c017 # v1.1.0
+        with:
+          token: "${{ secrets.TF_WORKFLOW_TFLOCAL_CLOUD_TFC_TOKEN }}"
+          organization: hashicorp-v2
+          workspace: tflocal-terraform-provider-tfe
+
+      
+      - uses: ./.github/actions/test-provider-tfe
+        with:
+          matrix_index: ${{ matrix.index }}
+          matrix_total: ${{ matrix.total }}
+          hostname: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).ngrok_domain }}
+          token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_token }}
+          testing-github-token: ${{ secrets.TESTING_GITHUB_TOKEN }}
+          admin_configuration_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.configuration }}
+          admin_provision_licenses_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.provision-licenses }}
+          admin_security_maintenance_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.security-maintenance }}
+          admin_site_admin_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.site-admin }}
+          admin_subscription_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.subscription }}
+          admin_support_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.support }}
+          admin_version_maintenance_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.version-maintenance }}
+          list_tests: "[^(TestAccTFESAMLSettings_omnibus|TestAcc.*RunDependent|TestAcc.*VCSDependent)]"
+
+  run-dependent-tests:
+    name: run-dependent-tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 40
+    strategy:
+      fail-fast: false
+      matrix:
+        total: [1]
+        index: [0]
+    steps:
+      - name: Fetch Outputs
+        id: tflocal
+        uses: hashicorp-forge/terraform-cloud-action/outputs@5583d5f554d268ac91b3c37fd0a5e9da2c78c017 # v1.1.0
+        with:
+          token: "${{ secrets.TF_WORKFLOW_TFLOCAL_CLOUD_TFC_TOKEN }}"
+          organization: hashicorp-v2
+          workspace: tflocal-terraform-provider-tfe
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: ./.github/actions/test-provider-tfe
+        with:
+          matrix_index: ${{ matrix.index }}
+          matrix_total: ${{ matrix.total }}
+          hostname: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).ngrok_domain }}
+          token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_token }}
+          testing-github-token: ${{ secrets.TESTING_GITHUB_TOKEN }}
+          admin_configuration_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.configuration }}
+          admin_provision_licenses_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.provision-licenses }}
+          admin_security_maintenance_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.security-maintenance }}
+          admin_site_admin_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.site-admin }}
+          admin_subscription_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.subscription }}
+          admin_support_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.support }}
+          admin_version_maintenance_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.version-maintenance }}
+          # Run terminal cmd 'go help testflag' to learn more about -list flag
+          # action.yml uses https://github.com/hashicorp-forge/go-test-split-action/blob/main/action.yml to split acceptance tests
+          # which runs against all tests using the list arg
+          # lists_tests regex is used to skip the TestAccTFESAMLSettings_omnibus test suite for CI tests only
+          list_tests: "TestAcc.*_RunDependent"
+  vcs-dependent-tests:
+    name: vcs-dependent-tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 40
+    strategy:
+      fail-fast: false
+      matrix:
+        total: [1]
+        index: [0]
     steps:
       - name: Fetch Outputs
         id: tflocal
@@ -55,11 +130,11 @@ jobs:
           # action.yml uses https://github.com/hashicorp-forge/go-test-split-action/blob/main/action.yml to split acceptance tests
           # which runs against all tests using the list arg
           # lists_tests regex is used to skip the TestAccTFESAMLSettings_omnibus test suite for CI tests only
-          list_tests: "[^(TestAccTFESAMLSettings_omnibus)]"
+          list_tests: "TestAcc.*_VCSDependent"
 
   tests-combine-summaries:
     name: Combine Test Reports
-    needs: [ tests ]
+    needs: [ tests, run-dependent-tests, vcs-dependent-tests ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
@@ -73,7 +148,8 @@ jobs:
         run: npm install -g junit-report-merger
 
       - name: Merge reports
-        run: jrm ./ci-summary-provider.xml "junit-test-summary-0/*.xml" "junit-test-summary-1/*.xml" "junit-test-summary-2/*.xml" "junit-test-summary-3/*.xml" "junit-test-summary-4/*.xml"
+        run: |
+          jrm ./ci-summary-provider.xml junit-tests-summary-*/*.xml
 
       - name: Upload test artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -82,14 +158,14 @@ jobs:
           path: ./ci-summary-provider.xml
 
   tests-summarize:
-    name: Summarize Tests
-    needs: [ tests ]
+    name: tests-summarize
+    needs: [ tests, run-dependent-tests, vcs-dependent-tests ]
     runs-on: ubuntu-latest
     if: ${{ always() }}
     steps:
       - name: Check tests Status
         run: |
-          if [ "${{ needs.tests.result }}" = "success" ]; then
+          if [ "${{ needs.tests.result }}" = "success" ] && [ "${{ needs.run-dependent-tests.result }}" = "success" ]; then
             exit 0
           fi
           exit 1
diff --git a/internal/provider/data_source_policy_set_test.go b/internal/provider/data_source_policy_set_test.go
index 8b381eb1d..ad7b95468 100644
--- a/internal/provider/data_source_policy_set_test.go
+++ b/internal/provider/data_source_policy_set_test.go
@@ -163,7 +163,7 @@ func TestAccTFEPolicySetDataSourceOPA_basic(t *testing.T) {
 	)
 }
 
-func TestAccTFEPolicySetDataSource_vcs(t *testing.T) {
+func TestAccTFEPolicySetDataSource_vcs_VCSDependent(t *testing.T) {
 	tfeClient, err := getClientUsingEnv()
 	if err != nil {
 		t.Fatal(err)
diff --git a/internal/provider/data_source_registry_module_test.go b/internal/provider/data_source_registry_module_test.go
index dd465a61a..c9020f440 100644
--- a/internal/provider/data_source_registry_module_test.go
+++ b/internal/provider/data_source_registry_module_test.go
@@ -92,7 +92,7 @@ func TestAccTFERegistryModuleDataSource_basicNoCodePublic(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModuleDataSource_basicNoCodePrivate(t *testing.T) {
+func TestAccTFERegistryModuleDataSource_basicNoCodePrivate_VCSDependent(t *testing.T) {
 	skipIfEnterprise(t)
 
 	dsName := "data.tfe_registry_module.test"
diff --git a/internal/provider/resource_tfe_no_code_module_test.go b/internal/provider/resource_tfe_no_code_module_test.go
index 981e6b4d0..54efd5e3b 100644
--- a/internal/provider/resource_tfe_no_code_module_test.go
+++ b/internal/provider/resource_tfe_no_code_module_test.go
@@ -41,7 +41,7 @@ func TestAccTFENoCodeModule_basic(t *testing.T) {
 	})
 }
 
-func TestAccTFENoCodeModule_with_variable_options(t *testing.T) {
+func TestAccTFENoCodeModule_with_variable_options_VCSDependent(t *testing.T) {
 	tfeClient, err := getClientUsingEnv()
 	if err != nil {
 		t.Fatalf("error getting client %v", err)
@@ -98,7 +98,7 @@ func TestAccTFENoCodeModule_with_variable_options(t *testing.T) {
 	})
 }
 
-func TestAccTFENoCodeModule_with_version_pin(t *testing.T) {
+func TestAccTFENoCodeModule_with_version_pin_VCSDependent(t *testing.T) {
 	tfeClient, err := getClientUsingEnv()
 	if err != nil {
 		t.Fatalf("error getting client %v", err)
diff --git a/internal/provider/resource_tfe_policy_set_test.go b/internal/provider/resource_tfe_policy_set_test.go
index f4c086eae..e3e4b25cd 100644
--- a/internal/provider/resource_tfe_policy_set_test.go
+++ b/internal/provider/resource_tfe_policy_set_test.go
@@ -471,7 +471,7 @@ func TestAccTFEPolicySet_updateToWorkspace(t *testing.T) {
 	})
 }
 
-func TestAccTFEPolicySet_vcs(t *testing.T) {
+func TestAccTFEPolicySet_vcs_VCSDependent(t *testing.T) {
 	tfeClient, err := getClientUsingEnv()
 	if err != nil {
 		t.Fatal(err)
@@ -526,7 +526,7 @@ func TestAccTFEPolicySet_vcs(t *testing.T) {
 	})
 }
 
-func TestAccTFEPolicySet_GithubApp(t *testing.T) {
+func TestAccTFEPolicySet_GithubApp_VCSDependent(t *testing.T) {
 	tfeClient, err := getClientUsingEnv()
 	if err != nil {
 		t.Fatal(err)
@@ -581,7 +581,7 @@ func TestAccTFEPolicySet_GithubApp(t *testing.T) {
 	})
 }
 
-func TestAccTFEPolicySet_updateVCSBranch(t *testing.T) {
+func TestAccTFEPolicySet_updateVCSBranch_VCSDependent(t *testing.T) {
 	tfeClient, err := getClientUsingEnv()
 	if err != nil {
 		t.Fatal(err)
@@ -767,7 +767,7 @@ func TestAccTFEPolicySet_versionedSlugUpdate(t *testing.T) {
 	})
 }
 
-func TestAccTFEPolicySet_versionedNoConflicts(t *testing.T) {
+func TestAccTFEPolicySet_versionedNoConflicts_VCSDependent(t *testing.T) {
 	tfeClient, err := getClientUsingEnv()
 	if err != nil {
 		t.Fatal(err)
diff --git a/internal/provider/resource_tfe_registry_module_test.go b/internal/provider/resource_tfe_registry_module_test.go
index f12954c84..557012314 100644
--- a/internal/provider/resource_tfe_registry_module_test.go
+++ b/internal/provider/resource_tfe_registry_module_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 )
 
-func TestAccTFERegistryModule_vcsBasic(t *testing.T) {
+func TestAccTFERegistryModule_vcsBasic_VCSDependent(t *testing.T) {
 	registryModule := &tfe.RegistryModule{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 	orgName := fmt.Sprintf("tst-terraform-%d", rInt)
@@ -77,7 +77,7 @@ func TestAccTFERegistryModule_vcsBasic(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_GitHubApp(t *testing.T) {
+func TestAccTFERegistryModule_GitHubApp_VCSDependent(t *testing.T) {
 	registryModule := &tfe.RegistryModule{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 	orgName := fmt.Sprintf("tst-terraform-%d", rInt)
@@ -134,7 +134,7 @@ func TestAccTFERegistryModule_GitHubApp(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_emptyVCSRepo(t *testing.T) {
+func TestAccTFERegistryModule_emptyVCSRepo_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -153,7 +153,7 @@ func TestAccTFERegistryModule_emptyVCSRepo(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_nonVCSPrivateRegistryModuleWithoutRegistryName(t *testing.T) {
+func TestAccTFERegistryModule_nonVCSPrivateRegistryModuleWithoutRegistryName_VCSDependent(t *testing.T) {
 	registryModule := &tfe.RegistryModule{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 	orgName := fmt.Sprintf("tst-terraform-%d", rInt)
@@ -202,7 +202,7 @@ func TestAccTFERegistryModule_nonVCSPrivateRegistryModuleWithoutRegistryName(t *
 	})
 }
 
-func TestAccTFERegistryModule_nonVCSPrivateRegistryModuleWithRegistryName(t *testing.T) {
+func TestAccTFERegistryModule_nonVCSPrivateRegistryModuleWithRegistryName_VCSDependent(t *testing.T) {
 	registryModule := &tfe.RegistryModule{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 	orgName := fmt.Sprintf("tst-terraform-%d", rInt)
@@ -251,7 +251,7 @@ func TestAccTFERegistryModule_nonVCSPrivateRegistryModuleWithRegistryName(t *tes
 	})
 }
 
-func TestAccTFERegistryModule_publicRegistryModule(t *testing.T) {
+func TestAccTFERegistryModule_publicRegistryModule_VCSDependent(t *testing.T) {
 	registryModule := &tfe.RegistryModule{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 	orgName := fmt.Sprintf("tst-terraform-%d", rInt)
@@ -300,7 +300,7 @@ func TestAccTFERegistryModule_publicRegistryModule(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_branchOnly(t *testing.T) {
+func TestAccTFERegistryModule_branchOnly_VCSDependent(t *testing.T) {
 	skipUnlessBeta(t)
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -324,7 +324,7 @@ func TestAccTFERegistryModule_branchOnly(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_vcsRepoWithTags(t *testing.T) {
+func TestAccTFERegistryModule_vcsRepoWithTags_VCSDependent(t *testing.T) {
 	skipUnlessBeta(t)
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -348,7 +348,7 @@ func TestAccTFERegistryModule_vcsRepoWithTags(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_noCodeModule(t *testing.T) {
+func TestAccTFERegistryModule_noCodeModule_VCSDependent(t *testing.T) {
 	skipIfEnterprise(t)
 
 	registryModule := &tfe.RegistryModule{}
@@ -402,7 +402,7 @@ func TestAccTFERegistryModule_noCodeModule(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModuleImport_vcsPrivateRMDeprecatedFormat(t *testing.T) {
+func TestAccTFERegistryModuleImport_vcsPrivateRMDeprecatedFormat_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -426,7 +426,7 @@ func TestAccTFERegistryModuleImport_vcsPrivateRMDeprecatedFormat(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModuleImport_vcsPrivateRMRecommendedFormat(t *testing.T) {
+func TestAccTFERegistryModuleImport_vcsPrivateRMRecommendedFormat_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -450,7 +450,7 @@ func TestAccTFERegistryModuleImport_vcsPrivateRMRecommendedFormat(t *testing.T)
 	})
 }
 
-func TestAccTFERegistryModuleImport_vcsPublishingMechanismBranchToTagsToBranch(t *testing.T) {
+func TestAccTFERegistryModuleImport_vcsPublishingMechanismBranchToTagsToBranch_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -509,7 +509,7 @@ func TestAccTFERegistryModuleImport_vcsPublishingMechanismBranchToTagsToBranch(t
 	})
 }
 
-func TestAccTFERegistryModule_branchOnlyEmpty(t *testing.T) {
+func TestAccTFERegistryModule_branchOnlyEmpty_VCSDependent(t *testing.T) {
 	skipUnlessBeta(t)
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -533,7 +533,7 @@ func TestAccTFERegistryModule_branchOnlyEmpty(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModuleImport_vcsPublishingMechanismBranchToTagsToBranchWithTests(t *testing.T) {
+func TestAccTFERegistryModuleImport_vcsPublishingMechanismBranchToTagsToBranchWithTests_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -574,7 +574,7 @@ func TestAccTFERegistryModuleImport_vcsPublishingMechanismBranchToTagsToBranchWi
 	})
 }
 
-func TestAccTFERegistryModuleImport_vcsPublishingMechanismTagsToBranchToTags(t *testing.T) {
+func TestAccTFERegistryModuleImport_vcsPublishingMechanismTagsToBranchToTags_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -624,7 +624,7 @@ func TestAccTFERegistryModuleImport_vcsPublishingMechanismTagsToBranchToTags(t *
 	})
 }
 
-func TestAccTFERegistryModule_invalidTestConfigOnCreate(t *testing.T) {
+func TestAccTFERegistryModule_invalidTestConfigOnCreate_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -642,7 +642,7 @@ func TestAccTFERegistryModule_invalidTestConfigOnCreate(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_invalidTestConfigOnUpdate(t *testing.T) {
+func TestAccTFERegistryModule_invalidTestConfigOnUpdate_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -669,7 +669,7 @@ func TestAccTFERegistryModule_invalidTestConfigOnUpdate(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_vcsTagsOnlyFalse(t *testing.T) {
+func TestAccTFERegistryModule_vcsTagsOnlyFalse_VCSDependent(t *testing.T) {
 	skipUnlessBeta(t)
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -688,7 +688,7 @@ func TestAccTFERegistryModule_vcsTagsOnlyFalse(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_branchAndInvalidTagsOnCreate(t *testing.T) {
+func TestAccTFERegistryModule_branchAndInvalidTagsOnCreate_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -706,7 +706,7 @@ func TestAccTFERegistryModule_branchAndInvalidTagsOnCreate(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_branchAndTagsEnabledOnCreate(t *testing.T) {
+func TestAccTFERegistryModule_branchAndTagsEnabledOnCreate_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -724,7 +724,7 @@ func TestAccTFERegistryModule_branchAndTagsEnabledOnCreate(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_branchAndTagsDisabledOnCreate(t *testing.T) {
+func TestAccTFERegistryModule_branchAndTagsDisabledOnCreate_VCSDependent(t *testing.T) {
 	skipUnlessBeta(t)
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -743,7 +743,7 @@ func TestAccTFERegistryModule_branchAndTagsDisabledOnCreate(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_branchAndTagsEnabledOnUpdate(t *testing.T) {
+func TestAccTFERegistryModule_branchAndTagsEnabledOnUpdate_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -770,7 +770,7 @@ func TestAccTFERegistryModule_branchAndTagsEnabledOnUpdate(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_branchAndTagsDisabledOnUpdate(t *testing.T) {
+func TestAccTFERegistryModule_branchAndTagsDisabledOnUpdate_VCSDependent(t *testing.T) {
 	skipUnlessBeta(t)
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -798,7 +798,7 @@ func TestAccTFERegistryModule_branchAndTagsDisabledOnUpdate(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModuleImport_nonVCSPrivateRM(t *testing.T) {
+func TestAccTFERegistryModuleImport_nonVCSPrivateRM_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -821,7 +821,7 @@ func TestAccTFERegistryModuleImport_nonVCSPrivateRM(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModuleImport_publicRM(t *testing.T) {
+func TestAccTFERegistryModuleImport_publicRM_VCSDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	resource.Test(t, resource.TestCase{
@@ -844,7 +844,7 @@ func TestAccTFERegistryModuleImport_publicRM(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_invalidWithBothVCSRepoAndModuleProvider(t *testing.T) {
+func TestAccTFERegistryModule_invalidWithBothVCSRepoAndModuleProvider_VCSDependent(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
@@ -859,7 +859,7 @@ func TestAccTFERegistryModule_invalidWithBothVCSRepoAndModuleProvider(t *testing
 	})
 }
 
-func TestAccTFERegistryModule_invalidRegistryName(t *testing.T) {
+func TestAccTFERegistryModule_invalidRegistryName_VCSDependent(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
@@ -874,7 +874,7 @@ func TestAccTFERegistryModule_invalidRegistryName(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_invalidWithModuleProviderAndNoName(t *testing.T) {
+func TestAccTFERegistryModule_invalidWithModuleProviderAndNoName_VCSDependent(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
@@ -889,7 +889,7 @@ func TestAccTFERegistryModule_invalidWithModuleProviderAndNoName(t *testing.T) {
 	})
 }
 
-func TestAccTFERegistryModule_invalidWithModuleProviderAndNoOrganization(t *testing.T) {
+func TestAccTFERegistryModule_invalidWithModuleProviderAndNoOrganization_VCSDependent(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
@@ -904,7 +904,7 @@ func TestAccTFERegistryModule_invalidWithModuleProviderAndNoOrganization(t *test
 	})
 }
 
-func TestAccTFERegistryModule_invalidWithNamespaceAndNoRegistryName(t *testing.T) {
+func TestAccTFERegistryModule_invalidWithNamespaceAndNoRegistryName_VCSDependent(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
@@ -919,7 +919,7 @@ func TestAccTFERegistryModule_invalidWithNamespaceAndNoRegistryName(t *testing.T
 	})
 }
 
-func TestAccTFERegistryModule_invalidWithRegistryNameAndNoModuleProvider(t *testing.T) {
+func TestAccTFERegistryModule_invalidWithRegistryNameAndNoModuleProvider_VCSDependent(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
diff --git a/internal/provider/resource_tfe_test_variable_test.go b/internal/provider/resource_tfe_test_variable_test.go
index 60652487b..bdacfe518 100644
--- a/internal/provider/resource_tfe_test_variable_test.go
+++ b/internal/provider/resource_tfe_test_variable_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
-func TestAccTFETestVariable_basic(t *testing.T) {
+func TestAccTFETestVariable_basic_VCSDependent(t *testing.T) {
 	variable := &tfe.Variable{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -53,7 +53,7 @@ func TestAccTFETestVariable_basic(t *testing.T) {
 	})
 }
 
-func TestAccTFETestVariable_valueWriteOnly(t *testing.T) {
+func TestAccTFETestVariable_valueWriteOnly_VCSDependent(t *testing.T) {
 	variable := &tfe.Variable{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -87,7 +87,7 @@ func TestAccTFETestVariable_valueWriteOnly(t *testing.T) {
 	})
 }
 
-func TestAccTFETestVariable_update(t *testing.T) {
+func TestAccTFETestVariable_update_VCSDependent(t *testing.T) {
 	variable := &tfe.Variable{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
diff --git a/internal/provider/resource_tfe_workspace_run_test.go b/internal/provider/resource_tfe_workspace_run_test.go
index 2b3b5fd62..105a50d22 100644
--- a/internal/provider/resource_tfe_workspace_run_test.go
+++ b/internal/provider/resource_tfe_workspace_run_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 )
 
-func TestAccTFEWorkspaceRun_withApplyOnlyBlock(t *testing.T) {
+func TestAccTFEWorkspaceRun_withApplyOnlyBlock_RunDependent(t *testing.T) {
 	skipUnlessBeta(t)
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -65,7 +65,7 @@ func TestAccTFEWorkspaceRun_withApplyOnlyBlock(t *testing.T) {
 	})
 }
 
-func TestAccTFEWorkspaceRun_withBothApplyAndDestroyBlocks(t *testing.T) {
+func TestAccTFEWorkspaceRun_withBothApplyAndDestroyBlocks_RunDependent(t *testing.T) {
 	skipUnlessBeta(t)
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -115,7 +115,7 @@ func TestAccTFEWorkspaceRun_withBothApplyAndDestroyBlocks(t *testing.T) {
 	})
 }
 
-func TestAccTFEWorkspaceRun_invalidParams(t *testing.T) {
+func TestAccTFEWorkspaceRun_invalidParams_RunDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	tfeClient, err := getClientUsingEnv()
@@ -156,7 +156,7 @@ func TestAccTFEWorkspaceRun_invalidParams(t *testing.T) {
 	}
 }
 
-func TestAccTFEWorkspaceRun_WhenRunErrors(t *testing.T) {
+func TestAccTFEWorkspaceRun_WhenRunErrors_RunDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	tfeClient, err := getClientUsingEnv()
diff --git a/internal/provider/resource_tfe_workspace_test.go b/internal/provider/resource_tfe_workspace_test.go
index 31e2651a5..e11a4ad73 100644
--- a/internal/provider/resource_tfe_workspace_test.go
+++ b/internal/provider/resource_tfe_workspace_test.go
@@ -1491,7 +1491,7 @@ func TestAccTFEWorkspace_structuredRunOutputDisabled(t *testing.T) {
 	})
 }
 
-func TestAccTFEWorkspace_updateVCSRepo(t *testing.T) {
+func TestAccTFEWorkspace_updateVCSRepo_VCSDependent(t *testing.T) {
 	workspace := &tfe.Workspace{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -1567,7 +1567,7 @@ func TestAccTFEWorkspace_updateVCSRepo(t *testing.T) {
 	})
 }
 
-func TestAccTFEWorkspace_updateGitHubAppRepo(t *testing.T) {
+func TestAccTFEWorkspace_updateGitHubAppRepo_VCSDependent(t *testing.T) {
 	workspace := &tfe.Workspace{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -1643,7 +1643,7 @@ func TestAccTFEWorkspace_updateGitHubAppRepo(t *testing.T) {
 	})
 }
 
-func TestAccTFEWorkspace_updateVCSRepoTagsRegex(t *testing.T) {
+func TestAccTFEWorkspace_updateVCSRepoTagsRegex_VCSDependent(t *testing.T) {
 	workspace := &tfe.Workspace{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -1695,7 +1695,7 @@ func TestAccTFEWorkspace_updateVCSRepoTagsRegex(t *testing.T) {
 	})
 }
 
-func TestAccTFEWorkspace_updateVCSRepoChangeTagRegexToTriggerPattern(t *testing.T) {
+func TestAccTFEWorkspace_updateVCSRepoChangeTagRegexToTriggerPattern_VCSDependent(t *testing.T) {
 	workspace := &tfe.Workspace{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -1747,7 +1747,7 @@ func TestAccTFEWorkspace_updateVCSRepoChangeTagRegexToTriggerPattern(t *testing.
 	})
 }
 
-func TestAccTFEWorkspace_updateRemoveVCSRepoWithTagsRegex(t *testing.T) {
+func TestAccTFEWorkspace_updateRemoveVCSRepoWithTagsRegex_VCSDependent(t *testing.T) {
 	workspace := &tfe.Workspace{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -1860,7 +1860,7 @@ func TestAccTFEWorkspace_import(t *testing.T) {
 	})
 }
 
-func TestAccTFEWorkspace_importVCSBranch(t *testing.T) {
+func TestAccTFEWorkspace_importVCSBranch_VCSDependent(t *testing.T) {
 	workspace := &tfe.Workspace{}
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()