diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
index 1a903b802..302a1b50d 100644
--- a/acceptance/acceptance_test.go
+++ b/acceptance/acceptance_test.go
@@ -223,10 +223,8 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
 
 	if !isTruePtr(config.Cloud) && cloudEnv != "" {
 		t.Skipf("Disabled via Cloud setting in %s (CLOUD_ENV=%s)", configPath, cloudEnv)
-	}
-
-	if config.RequiresStageFeature(UnityCatalogEnabledWorkspace) {
-		if os.Getenv("TEST_METASTORE_ID") == "" {
+	} else {
+		if isTruePtr(config.RequiresUnityCatalog) && os.Getenv("TEST_METASTORE_ID") == "" {
 			t.Skipf("Skipping on non-UC workspaces")
 		}
 	}
diff --git a/acceptance/bundle/deployment/bind/schema/test.toml b/acceptance/bundle/deployment/bind/schema/test.toml
index 0bfce4b65..46518d61e 100644
--- a/acceptance/bundle/deployment/bind/schema/test.toml
+++ b/acceptance/bundle/deployment/bind/schema/test.toml
@@ -1,3 +1,3 @@
 Local = false
 Cloud = true
-RequiredStageFeatures=["unity-catalog"]
+RequiresUnityCatalog = true
diff --git a/acceptance/config_test.go b/acceptance/config_test.go
index b98efaa70..82e260156 100644
--- a/acceptance/config_test.go
+++ b/acceptance/config_test.go
@@ -37,9 +37,8 @@ type TestConfig struct {
 	// If true, run this test when running with cloud env configured
 	Cloud *bool
 
-	// Which stage features this test requires. Each string is a feature name that must be present
-	// in the current stage for the test to run. If absent, no specific features are required.
-	RequiredStageFeatures []StageFeature
+	// If true and Cloud=true, run this test only if unity catalog is available in the cloud environment
+	RequiresUnityCatalog *bool
 
 	// List of additional replacements to apply on this test.
 	// Old is a regexp, New is a replacement expression.
@@ -69,15 +68,6 @@ type TestConfig struct {
 	CompiledIgnoreObject *ignore.GitIgnore
 }
 
-func (tc *TestConfig) RequiresStageFeature(feature StageFeature) bool {
-	for _, f := range tc.RequiredStageFeatures {
-		if f == feature {
-			return true
-		}
-	}
-	return false
-}
-
 type ServerStub struct {
 	// The HTTP method and path to match. Examples:
 	// 1. /api/2.0/clusters/list (matches all methods)