diff --git a/acceptance/bundle/config-remote-sync/multiple_resources/databricks.yml.tmpl b/acceptance/bundle/config-remote-sync/multiple_resources/databricks.yml.tmpl
index 421e62dc152..1cc53611e12 100644
--- a/acceptance/bundle/config-remote-sync/multiple_resources/databricks.yml.tmpl
+++ b/acceptance/bundle/config-remote-sync/multiple_resources/databricks.yml.tmpl
@@ -53,6 +53,7 @@ resources:
     test_warehouse:
       name: warehouse-$UNIQUE_NAME
       cluster_size: 2X-Small
+      auto_stop_mins: 10
 
 targets:
   default:
diff --git a/acceptance/bundle/invariant/configs/sql_warehouse.yml.tmpl b/acceptance/bundle/invariant/configs/sql_warehouse.yml.tmpl
index 4c1bef63037..f239f85afed 100644
--- a/acceptance/bundle/invariant/configs/sql_warehouse.yml.tmpl
+++ b/acceptance/bundle/invariant/configs/sql_warehouse.yml.tmpl
@@ -5,7 +5,8 @@ resources:
   sql_warehouses:
     foo:
       name: test-warehouse-$UNIQUE_NAME
-      cluster_size: X-Small
+      cluster_size: 2X-Small
+      auto_stop_mins: 10
       max_num_clusters: 1
       min_num_clusters: 1
       warehouse_type: CLASSIC
diff --git a/acceptance/bundle/resources/permissions/factcheck/databricks.yml.tmpl b/acceptance/bundle/resources/permissions/factcheck/databricks.yml.tmpl
index e049be4cb13..397f257a332 100644
--- a/acceptance/bundle/resources/permissions/factcheck/databricks.yml.tmpl
+++ b/acceptance/bundle/resources/permissions/factcheck/databricks.yml.tmpl
@@ -19,4 +19,5 @@ resources:
   sql_warehouses:
     warehouse:
       name: foo_$UNIQUE_NAME
-      cluster_size: Small
+      cluster_size: 2X-Small
+      auto_stop_mins: 10
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/databricks.yml.tmpl b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/databricks.yml.tmpl
index b13f77d0af5..a00485190ff 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/databricks.yml.tmpl
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/databricks.yml.tmpl
@@ -8,6 +8,7 @@ resources:
   sql_warehouses:
     mywarehouse:
       name: $UNIQUE_NAME
-      cluster_size: "Medium"
+      cluster_size: "2X-Small"
+      auto_stop_mins: 10
       lifecycle:
         started: false
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt
index b6fa122cc08..002a36777dd 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt
@@ -11,8 +11,8 @@ Deployment complete!
   "method": "POST",
   "path": "/api/2.0/sql/warehouses",
   "body": {
-    "auto_stop_mins": 120,
-    "cluster_size": "Medium",
+    "auto_stop_mins": 10,
+    "cluster_size": "2X-Small",
     "enable_photon": true,
     "max_num_clusters": 1,
     "name": "[UNIQUE_NAME]",
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/databricks.yml.tmpl b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/databricks.yml.tmpl
index 6eb3ba981e2..cfcc45c621f 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/databricks.yml.tmpl
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/databricks.yml.tmpl
@@ -8,6 +8,7 @@ resources:
   sql_warehouses:
     mywarehouse:
       name: $UNIQUE_NAME
-      cluster_size: "Medium"
+      cluster_size: "2X-Small"
+      auto_stop_mins: 10
       lifecycle:
         started: true
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt
index 027d148fdf8..21c9214f16b 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt
@@ -11,8 +11,8 @@ Deployment complete!
   "method": "POST",
   "path": "/api/2.0/sql/warehouses",
   "body": {
-    "auto_stop_mins": 120,
-    "cluster_size": "Medium",
+    "auto_stop_mins": 10,
+    "cluster_size": "2X-Small",
     "enable_photon": true,
     "max_num_clusters": 1,
     "name": "[UNIQUE_NAME]",