diff --git a/COMMIT-QUEUE.ini b/COMMIT-QUEUE.ini
index 64538e763a..6f0a858f0c 100644
--- a/COMMIT-QUEUE.ini
+++ b/COMMIT-QUEUE.ini
@@ -7,9 +7,11 @@
 
 [GENERAL]
 
-# Board-specific pre-cq, include boards that actually build chromeos-ec
-pre-cq-configs: gru-pre-cq reef-pre-cq
+# Board-specific no-vmtest-pre-cq, include boards that actually build
+# chromeos-ec.  We use the no-vmtest-pre-cq configs since the tests won't
+# actually test against our EC changes.  (That's what FAFT is for)
+pre-cq-configs: gru-no-vmtest-pre-cq reef-no-vmtest-pre-cq chell-no-vmtest-only-pre-cq
 
 # Stages to ignore in the commit queue. If these steps break, your CL will be
 # submitted anyway. Use with caution.
-ignored-stages: HWTest VMTest
+ignored-stages: HWTest ImageTest VMTest