diff --git a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/out.test.toml b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/out.test.toml
index 2d812727e32..e849ec85ace 100644
--- a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/out.test.toml
+++ b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/out.test.toml
@@ -1,4 +1,4 @@
-Local = false
+Local = true
 Cloud = true
 RequiresUnityCatalog = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
diff --git a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/test.toml b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/test.toml
index 476b9209ae6..f5706bb0af4 100644
--- a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/test.toml
+++ b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/test.toml
@@ -1,2 +1,3 @@
+Local = true
 Cloud = true
 RequiresUnityCatalog = true
diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.plan.direct.json b/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.plan.direct.json
index 85d713a72e0..2030bf1fb6f 100644
--- a/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.plan.direct.json
+++ b/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.plan.direct.json
@@ -15,7 +15,7 @@
         "effective_predictive_optimization_flag": {
           "inherited_from_name": "[METASTORE_NAME]",
           "inherited_from_type": "METASTORE",
-          "value": "ENABLE"
+          "value": "DISABLE"
         },
         "enable_predictive_optimization": "INHERIT",
         "full_name": "main.schema_dup_grants_[UNIQUE_NAME]",
diff --git a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan.direct.json b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan.direct.json
index 16cbf5fc15e..6949f43812e 100644
--- a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan.direct.json
+++ b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan.direct.json
@@ -15,7 +15,7 @@
         "effective_predictive_optimization_flag": {
           "inherited_from_name": "[METASTORE_NAME]",
           "inherited_from_type": "METASTORE",
-          "value": "ENABLE"
+          "value": "DISABLE"
         },
         "enable_predictive_optimization": "INHERIT",
         "full_name": "main.schema_out_of_band_principal_[UNIQUE_NAME]",
diff --git a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan2.direct.json b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan2.direct.json
index 4a4faa5d9e5..563771de5d9 100644
--- a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan2.direct.json
+++ b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan2.direct.json
@@ -15,7 +15,7 @@
         "effective_predictive_optimization_flag": {
           "inherited_from_name": "[METASTORE_NAME]",
           "inherited_from_type": "METASTORE",
-          "value": "ENABLE"
+          "value": "DISABLE"
         },
         "enable_predictive_optimization": "INHERIT",
         "full_name": "main.schema_out_of_band_principal_[UNIQUE_NAME]",
diff --git a/acceptance/bundle/resources/schemas/recreate/output.txt b/acceptance/bundle/resources/schemas/recreate/output.txt
index 12fedd022e4..1b1e3a3f9cd 100644
--- a/acceptance/bundle/resources/schemas/recreate/output.txt
+++ b/acceptance/bundle/resources/schemas/recreate/output.txt
@@ -76,7 +76,7 @@ Error: Resource catalog.SchemaInfo not found: main.myschema
   "effective_predictive_optimization_flag": {
     "inherited_from_name": "[METASTORE_NAME]",
     "inherited_from_type": "METASTORE",
-    "value": "ENABLE"
+    "value": "DISABLE"
   },
   "enable_predictive_optimization": "INHERIT",
   "full_name": "newmain.myschema",
diff --git a/bundle/direct/dresources/schema_test.go b/bundle/direct/dresources/schema_test.go
index d013610e052..8d58adaa3cb 100644
--- a/bundle/direct/dresources/schema_test.go
+++ b/bundle/direct/dresources/schema_test.go
@@ -58,7 +58,7 @@ func TestResourceSchema_DoUpdate_WithUnsupportedForceSendFields(t *testing.T) {
 		"effective_predictive_optimization_flag": {
 			"inherited_from_name": "deco-uc-prod-isolated-aws-us-east-1",
 			"inherited_from_type": "METASTORE",
-			"value": "ENABLE"
+			"value": "DISABLE"
 		},
 		"enable_predictive_optimization": "INHERIT",
 		"properties": {"key": "updated_value"},
diff --git a/libs/testserver/schemas.go b/libs/testserver/schemas.go
index cac8c5dfdd2..f3f7ecd2680 100644
--- a/libs/testserver/schemas.go
+++ b/libs/testserver/schemas.go
@@ -42,7 +42,9 @@ func (s *FakeWorkspace) SchemasCreate(req Request) Response {
 	schema.EffectivePredictiveOptimizationFlag = &catalog.EffectivePredictiveOptimizationFlag{
 		InheritedFromName: testMetastoreName,
 		InheritedFromType: catalog.EffectivePredictiveOptimizationFlagInheritedFromType("METASTORE"),
-		Value:             catalog.EnablePredictiveOptimizationEnable,
+		// Mirror the real test metastore, which inherits DISABLE, so a single
+		// golden stays valid for both local and cloud runs.
+		Value: catalog.EnablePredictiveOptimizationDisable,
 	}
 	schema.EnablePredictiveOptimization = catalog.EnablePredictiveOptimizationInherit
 	schema.MetastoreId = TestMetastore.MetastoreId