diff --git a/config/config_dump.json b/config/config_dump.json
index 9a69245..58b7234 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -51709,10 +51709,10 @@
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"bip\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"bobba\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"bobba360\",\n    \"test_suites\": []\n}",
-            "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"fleex\",\n    \"test_suites\": [\n        \"sanity\",\n        \"bvt-inline\",\n        \"bvt-installer\",\n        \"bvt-arc\",\n        \"au\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"arc-cts-qual\",\n        \"arc-gts-qual\"\n    ]\n}",
+            "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"fleex\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"grabbiter\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"korath\",\n    \"test_suites\": []\n}",
-            "{\n    \"lab_board_name\": \"meep\",\n    \"name\": \"meep\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"arc-cts-qual\",\n        \"arc-gts-qual\"\n    ]\n}",
+            "{\n    \"lab_board_name\": \"meep\",\n    \"name\": \"meep\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"mimrock\",\n    \"name\": \"mimrock\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"orbatrix\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"phaser\",\n    \"test_suites\": []\n}",
@@ -51878,10 +51878,10 @@
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"bip\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"bobba\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"bobba360\",\n    \"test_suites\": []\n}",
-            "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"fleex\",\n    \"test_suites\": [\n        \"sanity\",\n        \"bvt-inline\",\n        \"bvt-installer\",\n        \"bvt-arc\",\n        \"au\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"arc-cts-qual\",\n        \"arc-gts-qual\"\n    ]\n}",
+            "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"fleex\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"grabbiter\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"korath\",\n    \"test_suites\": []\n}",
-            "{\n    \"lab_board_name\": \"meep\",\n    \"name\": \"meep\",\n    \"test_suites\": [\n        \"bvt-inline\",\n        \"bvt-arc\",\n        \"bvt-cq\",\n        \"bvt-perbuild\",\n        \"arc-cts-qual\",\n        \"arc-gts-qual\"\n    ]\n}",
+            "{\n    \"lab_board_name\": \"meep\",\n    \"name\": \"meep\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"mimrock\",\n    \"name\": \"mimrock\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"orbatrix\",\n    \"test_suites\": []\n}",
             "{\n    \"lab_board_name\": \"octopus\",\n    \"name\": \"phaser\",\n    \"test_suites\": []\n}",
diff --git a/config/ge_build_config.json b/config/ge_build_config.json
index c18d110..26dfc2a 100644
--- a/config/ge_build_config.json
+++ b/config/ge_build_config.json
@@ -1607,15 +1607,6 @@
         {
           "board_name": "octopus",
           "name": "fleex",
-          "test_suites": [
-            "sanity",
-            "bvt-inline",
-            "bvt-installer",
-            "bvt-arc",
-            "au",
-            "bvt-cq",
-            "bvt-perbuild"
-          ],
           "cq_test_enabled": false,
           "release_builder_test_pool": "bvt"
         },
@@ -1634,12 +1625,6 @@
         {
           "board_name": "meep",
           "name": "meep",
-          "test_suites": [
-            "bvt-inline",
-            "bvt-arc",
-            "bvt-cq",
-            "bvt-perbuild"
-          ],
           "cq_test_enabled": false,
           "release_builder_test_pool": "bvt"
         },