diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
index eb2184ec85..7cbc5d55d8 100644
--- a/acceptance/acceptance_test.go
+++ b/acceptance/acceptance_test.go
@@ -416,14 +416,20 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
 				expanded = internal.SubsetExpanded(expanded, dir, scriptUsesEngine)
 			}
 
-			for ind, envset := range expanded {
-				envname := strings.Join(envset, "/")
-				t.Run(envname, func(t *testing.T) {
-					if runParallel {
-						t.Parallel()
-					}
-					runTest(t, dir, ind, coverDir, repls.Clone(), config, envset, envFilters)
-				})
+			// If the matrix expands to a single empty envset, run the test directly
+			// without creating a subtest (avoids the "#00" dummy subtest name).
+			if len(expanded) == 1 && len(expanded[0]) == 0 {
+				runTest(t, dir, 0, coverDir, repls.Clone(), config, nil, envFilters)
+			} else {
+				for ind, envset := range expanded {
+					envname := strings.Join(envset, "/")
+					t.Run(envname, func(t *testing.T) {
+						if runParallel {
+							t.Parallel()
+						}
+						runTest(t, dir, ind, coverDir, repls.Clone(), config, envset, envFilters)
+					})
+				}
 			}
 		})
 	}
diff --git a/acceptance/selftest/envmatrix_empty/out.test.toml b/acceptance/selftest/envmatrix_empty/out.test.toml
new file mode 100644
index 0000000000..d3e35285f1
--- /dev/null
+++ b/acceptance/selftest/envmatrix_empty/out.test.toml
@@ -0,0 +1,5 @@
+Local = true
+Cloud = false
+
+[EnvMatrix]
+  DATABRICKS_BUNDLE_ENGINE = []
diff --git a/acceptance/selftest/envmatrix_empty/output.txt b/acceptance/selftest/envmatrix_empty/output.txt
new file mode 100644
index 0000000000..ce01362503
--- /dev/null
+++ b/acceptance/selftest/envmatrix_empty/output.txt
@@ -0,0 +1 @@
+hello
diff --git a/acceptance/selftest/envmatrix_empty/script b/acceptance/selftest/envmatrix_empty/script
new file mode 100644
index 0000000000..2f08be9a02
--- /dev/null
+++ b/acceptance/selftest/envmatrix_empty/script
@@ -0,0 +1 @@
+echo hello
diff --git a/acceptance/selftest/envmatrix_empty/test.toml b/acceptance/selftest/envmatrix_empty/test.toml
new file mode 100644
index 0000000000..38bba6b641
--- /dev/null
+++ b/acceptance/selftest/envmatrix_empty/test.toml
@@ -0,0 +1,4 @@
+Local = true
+
+[EnvMatrix]
+DATABRICKS_BUNDLE_ENGINE = []
diff --git a/acceptance/selftest/envmatrix_mixed/out.test.toml b/acceptance/selftest/envmatrix_mixed/out.test.toml
new file mode 100644
index 0000000000..0f24132083
--- /dev/null
+++ b/acceptance/selftest/envmatrix_mixed/out.test.toml
@@ -0,0 +1,7 @@
+Local = true
+Cloud = false
+
+[EnvMatrix]
+  DATABRICKS_BUNDLE_ENGINE = []
+  FIRST = ["alpha", "beta"]
+  SECOND = []
diff --git a/acceptance/selftest/envmatrix_mixed/output.txt b/acceptance/selftest/envmatrix_mixed/output.txt
new file mode 100644
index 0000000000..8d7d94c862
--- /dev/null
+++ b/acceptance/selftest/envmatrix_mixed/output.txt
@@ -0,0 +1 @@
+FIRST=[FIRST]
diff --git a/acceptance/selftest/envmatrix_mixed/script b/acceptance/selftest/envmatrix_mixed/script
new file mode 100644
index 0000000000..cff0393565
--- /dev/null
+++ b/acceptance/selftest/envmatrix_mixed/script
@@ -0,0 +1 @@
+echo "FIRST=$FIRST"
diff --git a/acceptance/selftest/envmatrix_mixed/test.toml b/acceptance/selftest/envmatrix_mixed/test.toml
new file mode 100644
index 0000000000..6f556b54b3
--- /dev/null
+++ b/acceptance/selftest/envmatrix_mixed/test.toml
@@ -0,0 +1,6 @@
+Local = true
+
+[EnvMatrix]
+DATABRICKS_BUNDLE_ENGINE = []
+FIRST = ["alpha", "beta"]
+SECOND = []