diff --git a/buildbot/cbuildbot_config.py b/buildbot/cbuildbot_config.py
index 957f92f..eae3771 100755
--- a/buildbot/cbuildbot_config.py
+++ b/buildbot/cbuildbot_config.py
@@ -643,6 +643,7 @@
   """
 
   DEFAULT_HW_TEST = 'bvt'
+  CQ_HW_TEST = 'bvt_cq'
 
   # This timeout is larger than it needs to be because of autotest overhead.
   # TODO(davidjames): Reduce this timeout once http://crbug.com/366141 is fixed.
@@ -700,7 +701,7 @@
                         file_bugs=False, priority=constants.HWTEST_CQ_PRIORITY)
     # Allows kwargs overrides to default_dict for cq.
     default_dict.update(kwargs)
-    return [cls(cls.DEFAULT_HW_TEST, **default_dict)]
+    return [cls(cls.CQ_HW_TEST, **default_dict)]
 
   @classmethod
   def DefaultListPFQ(cls, **kwargs):
diff --git a/buildbot/config_dump.json b/buildbot/config_dump.json
index fc56000..cdedcd2 100644
--- a/buildbot/config_dump.json
+++ b/buildbot/config_dump.json
@@ -7043,7 +7043,7 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt\",\n    \"timeout\": 7200\n}"
+            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt_cq\",\n    \"timeout\": 7200\n}"
         ],
         "hw_tests_warn": false,
         "hwqual": false,
@@ -9290,7 +9290,7 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt\",\n    \"timeout\": 7200\n}"
+            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt_cq\",\n    \"timeout\": 7200\n}"
         ],
         "hw_tests_warn": false,
         "hwqual": false,
@@ -16708,7 +16708,7 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt\",\n    \"timeout\": 7200\n}"
+            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt_cq\",\n    \"timeout\": 7200\n}"
         ],
         "hw_tests_warn": false,
         "hwqual": false,
@@ -17011,7 +17011,7 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt\",\n    \"timeout\": 7200\n}"
+            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt_cq\",\n    \"timeout\": 7200\n}"
         ],
         "hw_tests_warn": false,
         "hwqual": false,
@@ -17603,7 +17603,7 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt\",\n    \"timeout\": 7200\n}"
+            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt_cq\",\n    \"timeout\": 7200\n}"
         ],
         "hw_tests_warn": false,
         "hwqual": false,
@@ -22123,7 +22123,7 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt\",\n    \"timeout\": 7200\n}"
+            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt_cq\",\n    \"timeout\": 7200\n}"
         ],
         "hw_tests_warn": false,
         "hwqual": false,
@@ -24895,7 +24895,7 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt\",\n    \"timeout\": 7200\n}"
+            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt_cq\",\n    \"timeout\": 7200\n}"
         ],
         "hw_tests_warn": false,
         "hwqual": false,
@@ -38446,7 +38446,7 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt\",\n    \"timeout\": 7200\n}"
+            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt_cq\",\n    \"timeout\": 7200\n}"
         ],
         "hw_tests_warn": false,
         "hwqual": false,
@@ -42281,7 +42281,7 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt\",\n    \"timeout\": 7200\n}"
+            "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": false,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"suite\": \"bvt_cq\",\n    \"timeout\": 7200\n}"
         ],
         "hw_tests_warn": false,
         "hwqual": false,