diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 8501eee..4caa11d 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -5199,7 +5199,6 @@
         "chrome_sdk_build_chrome": false,
         "description": "Commit Queue (internal)",
         "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-CQ",
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -5272,7 +5271,6 @@
         "description": "Release Builds (canary) (internal)",
         "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Canaries",
         "hwqual": true,
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -5553,7 +5551,6 @@
                 "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Canaries",
                 "grouped": true,
                 "hwqual": true,
-                "image_test": true,
                 "images": [
                     "base",
                     "test"
@@ -5593,7 +5590,6 @@
                 "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Canaries",
                 "grouped": true,
                 "hwqual": true,
-                "image_test": true,
                 "images": [
                     "base",
                     "test"
@@ -5624,7 +5620,6 @@
         "description": "Release Builds (canary) (internal)",
         "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Canaries",
         "hwqual": true,
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -5840,7 +5835,6 @@
         "chrome_sdk_build_chrome": false,
         "description": "Commit Queue (internal)",
         "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-CQ",
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -5912,7 +5906,6 @@
         "description": "Release Builds (canary) (internal)",
         "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Canaries",
         "hwqual": true,
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -39247,7 +39240,6 @@
             "chromeos-infra-eng@grotations.appspotmail.com"
         ],
         "health_threshold": 3,
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -39279,7 +39271,6 @@
         "description": "Full Builds",
         "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Continuous",
         "git_sync": true,
-        "image_test": true,
         "images": [
             "base",
             "recovery",
@@ -39312,7 +39303,6 @@
             "chromeos-infra-eng@grotations.appspotmail.com"
         ],
         "health_threshold": 3,
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -39342,7 +39332,6 @@
         "chrome_sdk_build_chrome": false,
         "description": "Commit Queue (internal)",
         "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-CQ",
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -39395,7 +39384,6 @@
             "chromeos-infra-eng@grotations.appspotmail.com"
         ],
         "health_threshold": 3,
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -39436,7 +39424,6 @@
             "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"max_retries\": 10,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"suite_min_duts\": 0,\n    \"timeout\": 13200,\n    \"warn_only\": true\n}"
         ],
         "hwqual": true,
-        "image_test": true,
         "images": [
             "base",
             "recovery",
@@ -60760,7 +60747,6 @@
             "chromeos-infra-eng@grotations.appspotmail.com"
         ],
         "health_threshold": 3,
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -60792,7 +60778,6 @@
         "description": "Full Builds",
         "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Continuous",
         "git_sync": true,
-        "image_test": true,
         "images": [
             "base",
             "recovery",
@@ -60825,7 +60810,6 @@
             "chromeos-infra-eng@grotations.appspotmail.com"
         ],
         "health_threshold": 3,
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -60858,7 +60842,6 @@
         "hw_tests": [
             "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"max_retries\": 10,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"cq\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"moblab_quick\",\n    \"suite_min_duts\": 0,\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
         ],
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -60911,7 +60894,6 @@
             "chromeos-infra-eng@grotations.appspotmail.com"
         ],
         "health_threshold": 3,
-        "image_test": true,
         "images": [
             "base",
             "test"
@@ -60953,7 +60935,6 @@
             "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"max_retries\": 10,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"suite_min_duts\": 0,\n    \"timeout\": 13200,\n    \"warn_only\": true\n}"
         ],
         "hwqual": true,
-        "image_test": true,
         "images": [
             "base",
             "recovery",
diff --git a/cbuildbot/generate_chromeos_config.py b/cbuildbot/generate_chromeos_config.py
index 2be8060..e3d7dc2 100644
--- a/cbuildbot/generate_chromeos_config.py
+++ b/cbuildbot/generate_chromeos_config.py
@@ -847,6 +847,7 @@
 )
 
 moblab = config_lib.BuildConfig(
+  image_test=False,
   vm_tests=[],
 )
 
@@ -885,7 +886,7 @@
     'gizmo',
 ])
 
-beaglebone = brillo.derive(rootfs_verification=False)
+beaglebone = brillo.derive(image_test=False, rootfs_verification=False)
 
 # This adds Chrome branding.
 official_chrome = config_lib.BuildConfig(