diff --git a/client/site_tests/audio_AudioCorruption/control b/client/site_tests/audio_AudioCorruption/control
index 181cea7..d00b9a8 100644
--- a/client/site_tests/audio_AudioCorruption/control
+++ b/client/site_tests/audio_AudioCorruption/control
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if Chrome can't catch error for playing corrupted mp3 audio.
 """
-SUITE = "bvt-perbuild, audio, qav"
+SUITE = "bvt-perbuild, audio"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "audio"
diff --git a/client/site_tests/audio_Microphone/control b/client/site_tests/audio_Microphone/control
index 2af12b6..bcc9b0b 100644
--- a/client/site_tests/audio_Microphone/control
+++ b/client/site_tests/audio_Microphone/control
@@ -14,7 +14,7 @@
 TEST_CATEGORY = 'Microphone'
 TEST_CLASS = 'audio'
 TEST_TYPE = 'client'
-SUITE = 'bvt-perbuild, audio, qav'
+SUITE = 'bvt-perbuild, audio'
 
 DOC = """
 This test run multiple cmdline tools to verify that microphone works correctly.
diff --git a/client/site_tests/build_RootFilesystemSize/control b/client/site_tests/build_RootFilesystemSize/control
index f7c1b49..d076538 100644
--- a/client/site_tests/build_RootFilesystemSize/control
+++ b/client/site_tests/build_RootFilesystemSize/control
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if the size of the rootfs size cannot be obtained.
 """
-SUITE = "bvt-inline, bvt, bvt_cq"
+SUITE = "bvt-inline"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "build"
diff --git a/client/site_tests/desktopui_KillRestart/control b/client/site_tests/desktopui_KillRestart/control
index f6fc8c9..6ed77a3 100644
--- a/client/site_tests/desktopui_KillRestart/control
+++ b/client/site_tests/desktopui_KillRestart/control
@@ -6,7 +6,7 @@
 NAME = "desktopui_KillRestart"
 PURPOSE = "Verify Chrome is automatically restarted if it dies."
 CRITERIA = "This test will fail if Chrome is not restarted after it is killed."
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "desktopui"
diff --git a/client/site_tests/desktopui_MediaAudioFeedback/control b/client/site_tests/desktopui_MediaAudioFeedback/control
index b8882bb..ecafc8f 100644
--- a/client/site_tests/desktopui_MediaAudioFeedback/control
+++ b/client/site_tests/desktopui_MediaAudioFeedback/control
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if media files sound is not audible.
 """
-SUITE = "bvt-perbuild, audio, qav"
+SUITE = "bvt-perbuild, audio"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "desktopui"
diff --git a/client/site_tests/desktopui_Respawn/control b/client/site_tests/desktopui_Respawn/control
index 9e12bbb..99ef873 100644
--- a/client/site_tests/desktopui_Respawn/control
+++ b/client/site_tests/desktopui_Respawn/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, jrbarnette"
 NAME = "desktopui_Respawn"
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "desktopui"
diff --git a/client/site_tests/desktopui_ScreenLocker/control b/client/site_tests/desktopui_ScreenLocker/control
index 22a5425..6bbb985 100644
--- a/client/site_tests/desktopui_ScreenLocker/control
+++ b/client/site_tests/desktopui_ScreenLocker/control
@@ -10,7 +10,7 @@
 autotestPrivate.lockScreen, or cannot be unlocked with the correct password,
 or if the screen is unlocked with an incorrect password.
 """
-SUITE = "bvt-inline, bvt, smoke, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "desktopui"
diff --git a/client/site_tests/graphics_GLAPICheck/control b/client/site_tests/graphics_GLAPICheck/control
index 7a161d8..a4caff2 100644
--- a/client/site_tests/graphics_GLAPICheck/control
+++ b/client/site_tests/graphics_GLAPICheck/control
@@ -14,7 +14,7 @@
   - If GL extensions don't include needed extensions
   - If X extensions don't include DAMAGE and Composite
 """
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics, hwqual'
+SUITE = 'bvt-cq, graphics, hwqual'
 TIME='SHORT'
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = "graphics"
diff --git a/client/site_tests/graphics_GLBench/control b/client/site_tests/graphics_GLBench/control
index 403b665..13c22bf 100644
--- a/client/site_tests/graphics_GLBench/control
+++ b/client/site_tests/graphics_GLBench/control
@@ -22,7 +22,7 @@
 # TODO(ihf): before making GLBench part of bvt make sure it runs strictly less
 # than 20 minutes. Also decide if reference image changes should block bvt or
 # maybe for BVT failures should just consider crashes.
-SUITE = 'bvt-perbuild, graphics, graphics_per-build, qav'
+SUITE = 'bvt-perbuild, graphics, graphics_per-build'
 TIME='MEDIUM'
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = "gl"
diff --git a/client/site_tests/graphics_GLBench/control.bvt b/client/site_tests/graphics_GLBench/control.bvt
index 6cdf4e5..d41b09d 100644
--- a/client/site_tests/graphics_GLBench/control.bvt
+++ b/client/site_tests/graphics_GLBench/control.bvt
@@ -20,7 +20,7 @@
 Note: it should nearly never be required to remove old versions of good/bad
 images from these directories.
 """
-SUITE = 'bvt-cq, bvt, bvt_cq'
+SUITE = 'bvt-cq'
 TIME='FAST'
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = "gl"
diff --git a/client/site_tests/graphics_GLMark2/control b/client/site_tests/graphics_GLMark2/control
index 0f1ae0f..62fc14e 100644
--- a/client/site_tests/graphics_GLMark2/control
+++ b/client/site_tests/graphics_GLMark2/control
@@ -5,7 +5,7 @@
 NAME = 'graphics_GLMark2'
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Benchmark the graphics library performance.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='MEDIUM'
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = "gl"
diff --git a/client/site_tests/graphics_GpuReset/control b/client/site_tests/graphics_GpuReset/control
index 8a8b61b..af85a74 100644
--- a/client/site_tests/graphics_GpuReset/control
+++ b/client/site_tests/graphics_GpuReset/control
@@ -8,7 +8,7 @@
 CRITERIA = """
 Detection of udev event notification of a GPU hang.
 """
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='MEDIUM'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = "gl"
diff --git a/client/site_tests/graphics_KernelMemory/control b/client/site_tests/graphics_KernelMemory/control
index 1f15e75..9c137ba 100644
--- a/client/site_tests/graphics_KernelMemory/control
+++ b/client/site_tests/graphics_KernelMemory/control
@@ -17,7 +17,7 @@
 TEST_TYPE = "client"
 JOB_RETRIES = 1
 
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 BUG_TEMPLATE = {
     'labels': ['Cr-OS-Kernel-Graphics'],
 }
diff --git a/client/site_tests/graphics_LibDRM/control b/client/site_tests/graphics_LibDRM/control
index 6b59022..5cba116 100644
--- a/client/site_tests/graphics_LibDRM/control
+++ b/client/site_tests/graphics_LibDRM/control
@@ -14,7 +14,7 @@
 TEST_TYPE = "client"
 JOB_RETRIES = 1
 
-SUITE = "bvt-cq, bvt, bvt_cq, graphics"
+SUITE = "bvt-cq, graphics"
 BUG_TEMPLATE = {
     'labels': ['Cr-OS-Kernel-Graphics'],
 }
diff --git a/client/site_tests/graphics_PerfControl/control b/client/site_tests/graphics_PerfControl/control
index f5ce402..6e351d4 100644
--- a/client/site_tests/graphics_PerfControl/control
+++ b/client/site_tests/graphics_PerfControl/control
@@ -10,7 +10,7 @@
 This test will also fail if more than 10 percent of the system CPU
 even after a wait of 60 seconds.
 """
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='fast'
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = "Performance"
diff --git a/client/site_tests/graphics_PiglitBVT/control.1 b/client/site_tests/graphics_PiglitBVT/control.1
index d395273..36bc3da 100644
--- a/client/site_tests/graphics_PiglitBVT/control.1
+++ b/client/site_tests/graphics_PiglitBVT/control.1
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.10 b/client/site_tests/graphics_PiglitBVT/control.10
index dc74dbb..9630d90 100644
--- a/client/site_tests/graphics_PiglitBVT/control.10
+++ b/client/site_tests/graphics_PiglitBVT/control.10
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.11 b/client/site_tests/graphics_PiglitBVT/control.11
index d1e9d2a..d5e6c11 100644
--- a/client/site_tests/graphics_PiglitBVT/control.11
+++ b/client/site_tests/graphics_PiglitBVT/control.11
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.12 b/client/site_tests/graphics_PiglitBVT/control.12
index ff46fe4..4825e83 100644
--- a/client/site_tests/graphics_PiglitBVT/control.12
+++ b/client/site_tests/graphics_PiglitBVT/control.12
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.13 b/client/site_tests/graphics_PiglitBVT/control.13
index f236cec..372cc5d 100644
--- a/client/site_tests/graphics_PiglitBVT/control.13
+++ b/client/site_tests/graphics_PiglitBVT/control.13
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.14 b/client/site_tests/graphics_PiglitBVT/control.14
index 8fa0be1..390746a 100644
--- a/client/site_tests/graphics_PiglitBVT/control.14
+++ b/client/site_tests/graphics_PiglitBVT/control.14
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.15 b/client/site_tests/graphics_PiglitBVT/control.15
index 8efdc5d..9191696 100644
--- a/client/site_tests/graphics_PiglitBVT/control.15
+++ b/client/site_tests/graphics_PiglitBVT/control.15
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.16 b/client/site_tests/graphics_PiglitBVT/control.16
index bc99e2a..30638d5 100644
--- a/client/site_tests/graphics_PiglitBVT/control.16
+++ b/client/site_tests/graphics_PiglitBVT/control.16
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.17 b/client/site_tests/graphics_PiglitBVT/control.17
index 9ec0fcd..0ae8d69 100644
--- a/client/site_tests/graphics_PiglitBVT/control.17
+++ b/client/site_tests/graphics_PiglitBVT/control.17
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.18 b/client/site_tests/graphics_PiglitBVT/control.18
index 3b4b680..7020cdb 100644
--- a/client/site_tests/graphics_PiglitBVT/control.18
+++ b/client/site_tests/graphics_PiglitBVT/control.18
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.19 b/client/site_tests/graphics_PiglitBVT/control.19
index a93f8ba..dfa9dc9 100644
--- a/client/site_tests/graphics_PiglitBVT/control.19
+++ b/client/site_tests/graphics_PiglitBVT/control.19
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.2 b/client/site_tests/graphics_PiglitBVT/control.2
index 2df55d6..ed0e478 100644
--- a/client/site_tests/graphics_PiglitBVT/control.2
+++ b/client/site_tests/graphics_PiglitBVT/control.2
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.20 b/client/site_tests/graphics_PiglitBVT/control.20
index eee85c1..9dedd77 100644
--- a/client/site_tests/graphics_PiglitBVT/control.20
+++ b/client/site_tests/graphics_PiglitBVT/control.20
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.3 b/client/site_tests/graphics_PiglitBVT/control.3
index a594789..ccdba9f 100644
--- a/client/site_tests/graphics_PiglitBVT/control.3
+++ b/client/site_tests/graphics_PiglitBVT/control.3
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.4 b/client/site_tests/graphics_PiglitBVT/control.4
index a334ce3..4a7780b 100644
--- a/client/site_tests/graphics_PiglitBVT/control.4
+++ b/client/site_tests/graphics_PiglitBVT/control.4
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.5 b/client/site_tests/graphics_PiglitBVT/control.5
index 14823bc..643064d 100644
--- a/client/site_tests/graphics_PiglitBVT/control.5
+++ b/client/site_tests/graphics_PiglitBVT/control.5
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.6 b/client/site_tests/graphics_PiglitBVT/control.6
index 6e42866..2e4b8c9 100644
--- a/client/site_tests/graphics_PiglitBVT/control.6
+++ b/client/site_tests/graphics_PiglitBVT/control.6
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.7 b/client/site_tests/graphics_PiglitBVT/control.7
index 0771e39..93ef3eb 100644
--- a/client/site_tests/graphics_PiglitBVT/control.7
+++ b/client/site_tests/graphics_PiglitBVT/control.7
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.8 b/client/site_tests/graphics_PiglitBVT/control.8
index 4c3e932..7346189 100644
--- a/client/site_tests/graphics_PiglitBVT/control.8
+++ b/client/site_tests/graphics_PiglitBVT/control.8
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/control.9 b/client/site_tests/graphics_PiglitBVT/control.9
index f0777be..ad01a72 100644
--- a/client/site_tests/graphics_PiglitBVT/control.9
+++ b/client/site_tests/graphics_PiglitBVT/control.9
@@ -6,7 +6,7 @@
 AUTHOR = 'chromeos-gfx'
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_PiglitBVT/generate_scripts.py b/client/site_tests/graphics_PiglitBVT/generate_scripts.py
index 7cd25b0..57c01fb 100755
--- a/client/site_tests/graphics_PiglitBVT/generate_scripts.py
+++ b/client/site_tests/graphics_PiglitBVT/generate_scripts.py
@@ -61,7 +61,7 @@
 AUTHOR = 'chromeos-gfx'\n\
 PURPOSE = 'Collection of automated tests for OpenGL implementations.'\n\
 CRITERIA = 'All tests in a slice have to pass, otherwise it will fail.'\n\
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'\n\
+SUITE = 'bvt-cq, graphics'\n\
 TIME='SHORT'\n\
 TEST_CATEGORY = 'Functional'\n\
 TEST_CLASS = 'graphics'\n\
diff --git a/client/site_tests/graphics_SanAngeles/control b/client/site_tests/graphics_SanAngeles/control
index bbb6c3a..02540f8 100644
--- a/client/site_tests/graphics_SanAngeles/control
+++ b/client/site_tests/graphics_SanAngeles/control
@@ -6,7 +6,7 @@
 NAME = 'graphics_SanAngeles'
 PURPOSE = 'Benchmark OpenGL object rendering.'
 CRITERIA = 'This test is a benchmark. It will fail if it fails to complete.'
-SUITE = 'bvt-cq, bvt, bvt_cq, graphics'
+SUITE = 'bvt-cq, graphics'
 TIME='MEDIUM'
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = "graphics"
diff --git a/client/site_tests/graphics_Sanity/control b/client/site_tests/graphics_Sanity/control
index b11c5c2..bb0d82c 100644
--- a/client/site_tests/graphics_Sanity/control
+++ b/client/site_tests/graphics_Sanity/control
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test fails if application screen shots cannot capture the screen output.
 """
-SUITE='bvt-cq, bvt, bvt_cq, graphics'
+SUITE='bvt-cq, graphics'
 TIME='SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = "graphics"
diff --git a/client/site_tests/graphics_WebGLAquarium/control b/client/site_tests/graphics_WebGLAquarium/control
index 55f0b65..15d5a2c 100644
--- a/client/site_tests/graphics_WebGLAquarium/control
+++ b/client/site_tests/graphics_WebGLAquarium/control
@@ -6,7 +6,7 @@
 NAME = "graphics_WebGLAquarium"
 PURPOSE = "Execute the WebGL aquarium test suite."
 CRITERIA = "All suite tests must not crash/hang."
-SUITE = "bvt-perbuild, graphics, qav"
+SUITE = "bvt-perbuild, graphics"
 TIME = "medium"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "graphics"
diff --git a/client/site_tests/graphics_WebGLPerformance/control b/client/site_tests/graphics_WebGLPerformance/control
index e2fe58e..bdfa516 100644
--- a/client/site_tests/graphics_WebGLPerformance/control
+++ b/client/site_tests/graphics_WebGLPerformance/control
@@ -6,7 +6,7 @@
 NAME = "graphics_WebGLPerformance"
 PURPOSE = "Execute the WebGL performance test suite."
 CRITERIA = "All suite tests must not crash/hang."
-SUITE = "bvt-perbuild, graphics, qav"
+SUITE = "bvt-perbuild, graphics"
 TIME = "medium"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "graphics"
diff --git a/client/site_tests/hardware_MemoryTotalSize/control b/client/site_tests/hardware_MemoryTotalSize/control
index 3cd3365..c8837ae 100644
--- a/client/site_tests/hardware_MemoryTotalSize/control
+++ b/client/site_tests/hardware_MemoryTotalSize/control
@@ -6,7 +6,7 @@
 AUTHOR = 'The Chromium OS Authors'
 PURPOSE = 'Verify there is enough memory to run Chrome OS.'
 CRITERIA = 'Fails if memory size >= 1G.'
-SUITE = "bvt-cq, bvt, bvt_cq, hwqual"
+SUITE = "bvt-cq, hwqual"
 TIME='SHORT'
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = "hardware"
diff --git a/client/site_tests/hardware_Memtester/control.quick b/client/site_tests/hardware_Memtester/control.quick
index c5b8e08..210ef84 100644
--- a/client/site_tests/hardware_Memtester/control.quick
+++ b/client/site_tests/hardware_Memtester/control.quick
@@ -9,7 +9,7 @@
 TIME='SHORT'
 TEST_CLASS = "hardware"
 TEST_TYPE = 'client'
-SUITE = 'bvt-cq, bvt, bvt_cq'
+SUITE = 'bvt-cq'
 
 DOC = """
 This test uses memtester to find memory subsystem faults. The quick test
diff --git a/client/site_tests/hardware_RamFio/control b/client/site_tests/hardware_RamFio/control
index 2a4c070..a3263a4 100644
--- a/client/site_tests/hardware_RamFio/control
+++ b/client/site_tests/hardware_RamFio/control
@@ -8,7 +8,7 @@
 TIME = 'SHORT'
 TEST_CLASS = 'hardware'
 TEST_TYPE = 'client'
-SUITE = 'bvt-cq, bvt, bvt_cq'
+SUITE = 'bvt-cq'
 JOB_RETRIES = 1
 
 DOC = """
diff --git a/client/site_tests/hardware_StorageWearoutDetect/control b/client/site_tests/hardware_StorageWearoutDetect/control
index 950941d..c5d97ba 100644
--- a/client/site_tests/hardware_StorageWearoutDetect/control
+++ b/client/site_tests/hardware_StorageWearoutDetect/control
@@ -8,7 +8,7 @@
 TIME = 'FAST'
 TEST_CLASS = 'hardware'
 TEST_TYPE = 'client'
-SUITE = 'bvt-cq, bvt, bvt_cq'
+SUITE = 'bvt-cq'
 
 DOC = """
 This test check wear out status for storage device available in SMART for SSD
diff --git a/client/site_tests/hardware_TrackpadFunction/control b/client/site_tests/hardware_TrackpadFunction/control
index c99f6dd..8ac990a 100644
--- a/client/site_tests/hardware_TrackpadFunction/control
+++ b/client/site_tests/hardware_TrackpadFunction/control
@@ -8,7 +8,7 @@
 CRITERIA = """
 If CMT is not loaded for any of the detected trackpad this test will fail.
 """
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "Hardware"
diff --git a/client/site_tests/kernel_ConfigVerify/control b/client/site_tests/kernel_ConfigVerify/control
index 52cb529..1ea277f 100644
--- a/client/site_tests/kernel_ConfigVerify/control
+++ b/client/site_tests/kernel_ConfigVerify/control
@@ -6,7 +6,7 @@
 AUTHOR = "The Chromium OS Authors"
 PURPOSE = "Verify various important CONFIG_* settings"
 CRITERIA = "Fails if kernel config variables are in an unexpected state"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "kernel"
diff --git a/client/site_tests/kernel_CpufreqMinMax/control b/client/site_tests/kernel_CpufreqMinMax/control
index 43dbae9..c0804fd 100644
--- a/client/site_tests/kernel_CpufreqMinMax/control
+++ b/client/site_tests/kernel_CpufreqMinMax/control
@@ -12,7 +12,7 @@
 CRITERIA = """
 Fails if cpufreq min or max settings cannot be adjusted.
 """
-SUITE = "bvt-perbuild, bvt"
+SUITE = "bvt-perbuild"
 TIME = "FAST"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "kernel"
diff --git a/client/site_tests/kernel_PerfEventRename/control b/client/site_tests/kernel_PerfEventRename/control
index 4d5e9ea..0119b68 100644
--- a/client/site_tests/kernel_PerfEventRename/control
+++ b/client/site_tests/kernel_PerfEventRename/control
@@ -18,7 +18,7 @@
 CRITERIA = """
 Fails if perf report doesn't contain the correct executable name
 """
-SUITE = "bvt-perbuild, bvt"
+SUITE = "bvt-perbuild"
 TIME = "FAST"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "kernel"
diff --git a/client/site_tests/kernel_ProtocolCheck/control b/client/site_tests/kernel_ProtocolCheck/control
index 9cd0186..878629f 100644
--- a/client/site_tests/kernel_ProtocolCheck/control
+++ b/client/site_tests/kernel_ProtocolCheck/control
@@ -6,7 +6,7 @@
 NAME = "kernel_ProtocolCheck"
 PURPOSE = "Check if the kernel supports the required network protocols."
 CRITERIA = "Fails if any of the required protocols are not available."
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "kernel"
diff --git a/client/site_tests/kernel_SchedCgroups/control b/client/site_tests/kernel_SchedCgroups/control
index 38c0708..a7bddba 100644
--- a/client/site_tests/kernel_SchedCgroups/control
+++ b/client/site_tests/kernel_SchedCgroups/control
@@ -9,7 +9,7 @@
 The test will fail if scheduler cgroups do not function correctly.
 """
 TIME = "SHORT"
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "kernel"
 TEST_TYPE = "client"
diff --git a/client/site_tests/kernel_TPMPing/control b/client/site_tests/kernel_TPMPing/control
index d8c1e17..cd16c95 100644
--- a/client/site_tests/kernel_TPMPing/control
+++ b/client/site_tests/kernel_TPMPing/control
@@ -6,7 +6,7 @@
 AUTHOR = "The Chromium OS Authors"
 PURPOSE = "Ping the TPM"
 CRITERIA = "Fails if user-level cannot communicate with the TPM."
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "kernel"
diff --git a/client/site_tests/logging_CrashSender/control b/client/site_tests/logging_CrashSender/control
index 91b18e1..65b4909 100644
--- a/client/site_tests/logging_CrashSender/control
+++ b/client/site_tests/logging_CrashSender/control
@@ -10,7 +10,7 @@
   - crash log messages are incorrect
   - crash is sent without user consent
 """
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "logging"
diff --git a/client/site_tests/logging_UdevCrash/control b/client/site_tests/logging_UdevCrash/control
index c829cd7..9cb5b7b 100644
--- a/client/site_tests/logging_UdevCrash/control
+++ b/client/site_tests/logging_UdevCrash/control
@@ -5,7 +5,7 @@
 AUTHOR = "Chromium OS Team"
 NAME = "logging_UdevCrash"
 PURPOSE = "Verify udev triggered crash works as expected."
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "logging"
diff --git a/client/site_tests/login_Cryptohome/control b/client/site_tests/login_Cryptohome/control
index f8b6e03..d01a67c 100644
--- a/client/site_tests/login_Cryptohome/control
+++ b/client/site_tests/login_Cryptohome/control
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if cryptohome is mounted when not logged in, or vice versa.
 """
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "login"
diff --git a/client/site_tests/login_CryptohomeIncognito/control b/client/site_tests/login_CryptohomeIncognito/control
index 8665977..0020783 100644
--- a/client/site_tests/login_CryptohomeIncognito/control
+++ b/client/site_tests/login_CryptohomeIncognito/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, achuith"
 NAME = "login_CryptohomeIncognito"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "login"
diff --git a/client/site_tests/login_GuestAndActualSession/control b/client/site_tests/login_GuestAndActualSession/control
index 40f7271..8ddd676 100644
--- a/client/site_tests/login_GuestAndActualSession/control
+++ b/client/site_tests/login_GuestAndActualSession/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, joaodasilva"
 NAME = "login_GuestAndActualSession"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "FAST"
 TEST_CLASS = "login"
 TEST_TYPE = "client"
diff --git a/client/site_tests/login_LoginSuccess/control b/client/site_tests/login_LoginSuccess/control
index 5236129..b196b9e 100644
--- a/client/site_tests/login_LoginSuccess/control
+++ b/client/site_tests/login_LoginSuccess/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, achuith"
 NAME = "login_LoginSuccess"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "login"
diff --git a/client/site_tests/login_LogoutProcessCleanup/control b/client/site_tests/login_LogoutProcessCleanup/control
index f4de396..e5589d7 100644
--- a/client/site_tests/login_LogoutProcessCleanup/control
+++ b/client/site_tests/login_LogoutProcessCleanup/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, achuith"
 NAME = "login_LogoutProcessCleanup"
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "login"
diff --git a/client/site_tests/login_MultiUserPolicy/control b/client/site_tests/login_MultiUserPolicy/control
index 0fa0086..4b940b9 100644
--- a/client/site_tests/login_MultiUserPolicy/control
+++ b/client/site_tests/login_MultiUserPolicy/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "joaodasilva, cmasone"
 NAME = "login_MultiUserPolicy"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "login"
diff --git a/client/site_tests/login_MultipleSessions/control b/client/site_tests/login_MultipleSessions/control
index 8bf27a2..385cd48 100644
--- a/client/site_tests/login_MultipleSessions/control
+++ b/client/site_tests/login_MultipleSessions/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, joaodasilva"
 NAME = "login_MultipleSessions"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "FAST"
 TEST_CLASS = "login"
 TEST_TYPE = "client"
diff --git a/client/site_tests/login_OwnershipApi/control b/client/site_tests/login_OwnershipApi/control
index ed993d8..877b547 100644
--- a/client/site_tests/login_OwnershipApi/control
+++ b/client/site_tests/login_OwnershipApi/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, mnissler"
 NAME = "login_OwnershipApi"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME="SHORT"
 TEST_CLASS = "login"
 TEST_CATEGORY = "Functional"
diff --git a/client/site_tests/login_OwnershipNotRetaken/control b/client/site_tests/login_OwnershipNotRetaken/control
index e646505..150687a 100644
--- a/client/site_tests/login_OwnershipNotRetaken/control
+++ b/client/site_tests/login_OwnershipNotRetaken/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, mnissler"
 NAME = "login_OwnershipNotRetaken"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "login"
diff --git a/client/site_tests/login_OwnershipRetaken/control b/client/site_tests/login_OwnershipRetaken/control
index d16e93e..94a150b 100644
--- a/client/site_tests/login_OwnershipRetaken/control
+++ b/client/site_tests/login_OwnershipRetaken/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, mnissler"
 NAME = "login_OwnershipRetaken"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "login"
diff --git a/client/site_tests/login_OwnershipTaken/control b/client/site_tests/login_OwnershipTaken/control
index 10ced73..8985f5d 100644
--- a/client/site_tests/login_OwnershipTaken/control
+++ b/client/site_tests/login_OwnershipTaken/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, mnissler"
 NAME = "login_OwnershipTaken"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "login"
diff --git a/client/site_tests/login_RemoteOwnership/control b/client/site_tests/login_RemoteOwnership/control
index e0281e4..88c6152 100644
--- a/client/site_tests/login_RemoteOwnership/control
+++ b/client/site_tests/login_RemoteOwnership/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, mnissler"
 NAME = "login_RemoteOwnership"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME="SHORT"
 TEST_CLASS = "login"
 TEST_CATEGORY = "Functional"
diff --git a/client/site_tests/login_RetrieveActiveSessions/control b/client/site_tests/login_RetrieveActiveSessions/control
index 7deced3..51cd11f 100644
--- a/client/site_tests/login_RetrieveActiveSessions/control
+++ b/client/site_tests/login_RetrieveActiveSessions/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, nkostylev"
 NAME = "login_RetrieveActiveSessions"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "FAST"
 TEST_CLASS = "login"
 TEST_TYPE = "client"
diff --git a/client/site_tests/login_SameSessionTwice/control b/client/site_tests/login_SameSessionTwice/control
index 2aaa6c2..1cc464c 100644
--- a/client/site_tests/login_SameSessionTwice/control
+++ b/client/site_tests/login_SameSessionTwice/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "cmasone, joaodasilva"
 NAME = "login_SameSessionTwice"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "FAST"
 TEST_CLASS = "login"
 TEST_TYPE = "client"
diff --git a/client/site_tests/login_UserPolicyKeys/control b/client/site_tests/login_UserPolicyKeys/control
index e07413a..09cd424 100644
--- a/client/site_tests/login_UserPolicyKeys/control
+++ b/client/site_tests/login_UserPolicyKeys/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "joaodasilva, cmasone"
 NAME = "login_UserPolicyKeys"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "login"
diff --git a/client/site_tests/network_CheckCriticalProcesses/control b/client/site_tests/network_CheckCriticalProcesses/control
index 2bc5f17..b5c929d 100644
--- a/client/site_tests/network_CheckCriticalProcesses/control
+++ b/client/site_tests/network_CheckCriticalProcesses/control
@@ -4,7 +4,7 @@
 
 AUTHOR = 'pstew, quiche, wiley'
 NAME = 'network_CheckCriticalProcesses'
-SUITE='bvt-cq, bvt, bvt_cq, network_nightly'
+SUITE='bvt-cq, network_nightly'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 JOB_RETRIES = 1
diff --git a/client/site_tests/network_DefaultProfileCreation/control b/client/site_tests/network_DefaultProfileCreation/control
index fd7bdc8..d3a06fe 100644
--- a/client/site_tests/network_DefaultProfileCreation/control
+++ b/client/site_tests/network_DefaultProfileCreation/control
@@ -4,7 +4,7 @@
 
 AUTHOR = 'quiche, pstew'
 NAME = 'network_DefaultProfileCreation'
-SUITE = 'bvt-cq, bvt, bvt_cq, network_nightly'
+SUITE = 'bvt-cq, network_nightly'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 JOB_RETRIES = 1
diff --git a/client/site_tests/network_DefaultProfileServices/control b/client/site_tests/network_DefaultProfileServices/control
index 7584328..8e24269 100644
--- a/client/site_tests/network_DefaultProfileServices/control
+++ b/client/site_tests/network_DefaultProfileServices/control
@@ -4,7 +4,7 @@
 
 AUTHOR = 'quiche, pstew'
 NAME = 'network_DefaultProfileServices'
-SUITE = 'bvt-cq, bvt, bvt_cq, network_nightly'
+SUITE = 'bvt-cq, network_nightly'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 JOB_RETRIES = 1
diff --git a/client/site_tests/network_DestinationVerification/control b/client/site_tests/network_DestinationVerification/control
index 31a675c..d215e9a 100644
--- a/client/site_tests/network_DestinationVerification/control
+++ b/client/site_tests/network_DestinationVerification/control
@@ -4,7 +4,7 @@
 
 AUTHOR = 'wiley, pstew'
 NAME = 'network_DestinationVerification'
-SUITE = 'bvt-cq, bvt, bvt_cq, network_nightly'
+SUITE = 'bvt-cq, network_nightly'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 JOB_RETRIES = 1
diff --git a/client/site_tests/network_VPNConnect/control.l2tpipsec_cert b/client/site_tests/network_VPNConnect/control.l2tpipsec_cert
index 3067f51..fd85c2b 100644
--- a/client/site_tests/network_VPNConnect/control.l2tpipsec_cert
+++ b/client/site_tests/network_VPNConnect/control.l2tpipsec_cert
@@ -5,7 +5,7 @@
 AUTHOR = 'pstew, wiley, quiche'
 NAME = 'network_VPNConnect.l2tpipsec_cert'
 PURPOSE = 'Verify shill correctly authenticates to an L2TP/IPSec Cert VPN'
-SUITE = 'bvt-perbuild, network_nightly, qav'
+SUITE = 'bvt-perbuild, network_nightly'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 
diff --git a/client/site_tests/network_VPNConnect/control.l2tpipsec_psk b/client/site_tests/network_VPNConnect/control.l2tpipsec_psk
index 941867f..719b115 100644
--- a/client/site_tests/network_VPNConnect/control.l2tpipsec_psk
+++ b/client/site_tests/network_VPNConnect/control.l2tpipsec_psk
@@ -4,7 +4,7 @@
 
 AUTHOR = 'pstew, wiley, quiche'
 NAME = 'network_VPNConnect.l2tpipsec_psk'
-SUITE = 'bvt-perbuild, network_nightly, qav'
+SUITE = 'bvt-perbuild, network_nightly'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 
diff --git a/client/site_tests/network_VPNConnect/control.l2tpipsec_xauth b/client/site_tests/network_VPNConnect/control.l2tpipsec_xauth
index b2e6d7a..862c754 100644
--- a/client/site_tests/network_VPNConnect/control.l2tpipsec_xauth
+++ b/client/site_tests/network_VPNConnect/control.l2tpipsec_xauth
@@ -4,7 +4,7 @@
 
 AUTHOR = 'pstew, wiley, quiche'
 NAME = 'network_VPNConnect.l2tpipsec_xauth'
-SUITE = 'bvt-perbuild, qav'
+SUITE = 'bvt-perbuild'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 
diff --git a/client/site_tests/network_VPNConnect/control.openvpn b/client/site_tests/network_VPNConnect/control.openvpn
index ea1233a..bb5099d 100644
--- a/client/site_tests/network_VPNConnect/control.openvpn
+++ b/client/site_tests/network_VPNConnect/control.openvpn
@@ -4,7 +4,7 @@
 
 AUTHOR = 'pstew, wiley, quiche'
 NAME = 'network_VPNConnect.openvpn'
-SUITE = 'bvt-perbuild, network_nightly, qav'
+SUITE = 'bvt-perbuild, network_nightly'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 
diff --git a/client/site_tests/network_VPNConnect/control.openvpn_cert_verify b/client/site_tests/network_VPNConnect/control.openvpn_cert_verify
index de6bf0e..56b94dd 100644
--- a/client/site_tests/network_VPNConnect/control.openvpn_cert_verify
+++ b/client/site_tests/network_VPNConnect/control.openvpn_cert_verify
@@ -4,7 +4,7 @@
 
 AUTHOR = 'pstew, wiley, quiche'
 NAME = 'network_VPNConnect.openvpn_cert_verify'
-SUITE = 'bvt-perbuild, network_nightly, qav'
+SUITE = 'bvt-perbuild, network_nightly'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 
diff --git a/client/site_tests/network_VPNConnect/control.openvpn_user_pass b/client/site_tests/network_VPNConnect/control.openvpn_user_pass
index 157e567..35cc214 100644
--- a/client/site_tests/network_VPNConnect/control.openvpn_user_pass
+++ b/client/site_tests/network_VPNConnect/control.openvpn_user_pass
@@ -4,7 +4,7 @@
 
 AUTHOR = 'pstew, wiley, quiche'
 NAME = 'network_VPNConnect.openvpn_user_pass'
-SUITE = 'bvt-perbuild, network_nightly, qav'
+SUITE = 'bvt-perbuild, network_nightly'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 
diff --git a/client/site_tests/network_WiFiInvalidParameters/control b/client/site_tests/network_WiFiInvalidParameters/control
index 1d24509..5ad6c3e 100644
--- a/client/site_tests/network_WiFiInvalidParameters/control
+++ b/client/site_tests/network_WiFiInvalidParameters/control
@@ -5,7 +5,7 @@
 AUTHOR = 'wiley, pstew, quiche'
 NAME = 'network_WiFiInvalidParameters'
 PURPOSE = 'Verify shill returns correct errors for invalid WiFi configurations'
-SUITE = 'bvt-cq, bvt, bvt_cq, network_nightly'
+SUITE = 'bvt-cq, network_nightly'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 JOB_RETRIES = 1
diff --git a/client/site_tests/p2p_ConsumeFiles/control b/client/site_tests/p2p_ConsumeFiles/control
index 1f412c4..f8ae0f6 100644
--- a/client/site_tests/p2p_ConsumeFiles/control
+++ b/client/site_tests/p2p_ConsumeFiles/control
@@ -18,7 +18,7 @@
 NAME = 'p2p_ConsumeFiles'
 PURPOSE = 'Check that P2P can discover peers and download from them.'
 CRITERIA = 'Fails if p2p-client is not able to discover and get the URLs.'
-SUITE = 'bvt-cq, bvt, bvt_cq'
+SUITE = 'bvt-cq'
 TEST_CLASS = 'platform'
 TEST_CATEGORY = 'Functional'
 TEST_TYPE = 'client'
diff --git a/client/site_tests/p2p_ShareFiles/control b/client/site_tests/p2p_ShareFiles/control
index 7d39067..6fd4ad5 100644
--- a/client/site_tests/p2p_ShareFiles/control
+++ b/client/site_tests/p2p_ShareFiles/control
@@ -16,7 +16,7 @@
 NAME = 'p2p_ShareFiles'
 PURPOSE = 'Check that P2P daemon shares files on the network.'
 CRITERIA = "Fails if p2p-server doesn't announce its shared files via mDNS."
-SUITE = 'bvt-cq, bvt, bvt_cq'
+SUITE = 'bvt-cq'
 TEST_CLASS = 'platform'
 TEST_CATEGORY = 'Functional'
 TEST_TYPE = 'client'
diff --git a/client/site_tests/platform_BootPerf/control b/client/site_tests/platform_BootPerf/control
index 083ddf8..8a50ab4 100644
--- a/client/site_tests/platform_BootPerf/control
+++ b/client/site_tests/platform_BootPerf/control
@@ -9,7 +9,7 @@
 The test will fail if startup times or shut down times are exceeded. These
 values are set in the suite control file.
 """
-SUITE = "bvt-perbuild, qav"
+SUITE = "bvt-perbuild"
 TIME = "SHORT"
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_CrosDisksDBus/control b/client/site_tests/platform_CrosDisksDBus/control
index c9bfd60..22447bf 100644
--- a/client/site_tests/platform_CrosDisksDBus/control
+++ b/client/site_tests/platform_CrosDisksDBus/control
@@ -8,7 +8,7 @@
 
 CRITERIA = """
 """
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_CrosDisksFilesystem/control b/client/site_tests/platform_CrosDisksFilesystem/control
index ccbdb38..144b636 100644
--- a/client/site_tests/platform_CrosDisksFilesystem/control
+++ b/client/site_tests/platform_CrosDisksFilesystem/control
@@ -8,7 +8,7 @@
 
 CRITERIA = """
 """
-SUITE = "bvt-perbuild, regression, qav"
+SUITE = "bvt-perbuild, regression"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_CryptohomeMigrateKey/control b/client/site_tests/platform_CryptohomeMigrateKey/control
index 654c5c0..b2796e1 100644
--- a/client/site_tests/platform_CryptohomeMigrateKey/control
+++ b/client/site_tests/platform_CryptohomeMigrateKey/control
@@ -6,7 +6,7 @@
 NAME = "platform_CryptohomeMigrateKey"
 PURPOSE = "Verify that password changes work."
 CRITERIA = "This test will fail if password changes fail."
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_DebugDaemonGetPerfData/control b/client/site_tests/platform_DebugDaemonGetPerfData/control
index 1a9bacb..e30b3e6 100644
--- a/client/site_tests/platform_DebugDaemonGetPerfData/control
+++ b/client/site_tests/platform_DebugDaemonGetPerfData/control
@@ -15,7 +15,7 @@
 TEST_TYPE = "client"
 JOB_RETRIES = 1
 
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 
 DOC = """
 Exercises the debugd GetPerfData API.
diff --git a/client/site_tests/platform_FilePerms/control b/client/site_tests/platform_FilePerms/control
index 474ed3c..64241c4 100644
--- a/client/site_tests/platform_FilePerms/control
+++ b/client/site_tests/platform_FilePerms/control
@@ -9,7 +9,7 @@
 This test will fail if it finds unexpected permissions on system files or
 directories.
 """
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_HighResTimers/control b/client/site_tests/platform_HighResTimers/control
index bb8a086..68988e8 100644
--- a/client/site_tests/platform_HighResTimers/control
+++ b/client/site_tests/platform_HighResTimers/control
@@ -6,7 +6,7 @@
 NAME = "platform_HighResTimers"
 PURPOSE = "Ensure the high resolution timers are working."
 CRITERIA = "Fails if no timers have nanosecond resolution."
-SUITE = "bvt-cq, bvt, bvt_cq, hwqual"
+SUITE = "bvt-cq, hwqual"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_KernelVersionByBoard/control b/client/site_tests/platform_KernelVersionByBoard/control
index 094982d..f228787 100644
--- a/client/site_tests/platform_KernelVersionByBoard/control
+++ b/client/site_tests/platform_KernelVersionByBoard/control
@@ -5,7 +5,7 @@
 AUTHOR = "Chrome OS Team"
 NAME = "platform_KernelVersionByBoard"
 PURPOSE = "Ensure the running kernel is the same as an expected value."
-SUITE = "bvt-perbuild, qav"
+SUITE = "bvt-perbuild"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_MemCheck/control b/client/site_tests/platform_MemCheck/control
index 51b962e..6346c11 100644
--- a/client/site_tests/platform_MemCheck/control
+++ b/client/site_tests/platform_MemCheck/control
@@ -13,7 +13,7 @@
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'platform'
 TEST_TYPE = 'client'
-SUITE = 'bvt-cq, bvt, bvt_cq'
+SUITE = 'bvt-cq'
 DEPENDENCIES = 'cleanup-reboot'
 DOC = """
 Verifies that memory levels look sane.
diff --git a/client/site_tests/platform_OSLimits/control b/client/site_tests/platform_OSLimits/control
index 00c10e2..b1eb2e6 100644
--- a/client/site_tests/platform_OSLimits/control
+++ b/client/site_tests/platform_OSLimits/control
@@ -24,7 +24,7 @@
   - net/ipv4/tcp_syncookies
   - vm/mmap_min_addr
 """
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_PartitionCheck/control b/client/site_tests/platform_PartitionCheck/control
index a1dc512..7081558 100644
--- a/client/site_tests/platform_PartitionCheck/control
+++ b/client/site_tests/platform_PartitionCheck/control
@@ -6,7 +6,7 @@
 NAME = "platform_PartitionCheck"
 PURPOSE = "Verify size of rootfs are as expected."
 CRITERIA = "Fail if rootfs partitions are not of our reference size."
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_RootPartitionsNotMounted/control b/client/site_tests/platform_RootPartitionsNotMounted/control
index 3308d2a..0a9f5fa 100644
--- a/client/site_tests/platform_RootPartitionsNotMounted/control
+++ b/client/site_tests/platform_RootPartitionsNotMounted/control
@@ -12,7 +12,7 @@
 This test will fail if a root partition is mounted by a process other than
 update-engine.
 """
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/power_AudioDetector/control b/client/site_tests/power_AudioDetector/control
index 144f6f8..c31ba06 100644
--- a/client/site_tests/power_AudioDetector/control
+++ b/client/site_tests/power_AudioDetector/control
@@ -15,7 +15,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-SUITE = "bvt-perbuild, qav"
+SUITE = "bvt-perbuild"
 
 DOC = """
 This test verifies that the system will not suspend while audio is playing.
diff --git a/client/site_tests/power_Idle/control b/client/site_tests/power_Idle/control
index 2b23a68..ea1fe47 100644
--- a/client/site_tests/power_Idle/control
+++ b/client/site_tests/power_Idle/control
@@ -10,7 +10,7 @@
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-SUITE = "bvt-perbuild, qav"
+SUITE = "bvt-perbuild"
 
 DOC = """
 This test records power related statistics while the system is idling.
diff --git a/client/site_tests/power_Resume/control b/client/site_tests/power_Resume/control
index 047a5a5..3bbb264 100644
--- a/client/site_tests/power_Resume/control
+++ b/client/site_tests/power_Resume/control
@@ -6,7 +6,7 @@
 NAME = "power_Resume"
 PURPOSE = "Measure the amount of time it takes to resume from suspend."
 CRITERIA = "This test is a benchmark."
-SUITE = "bvt-perbuild, power_build, qav"
+SUITE = "bvt-perbuild, power_build"
 TIME = "SHORT"
 TEST_CATEGORY = "Logging"
 TEST_CLASS = "power"
diff --git a/client/site_tests/security_ASLR/control b/client/site_tests/security_ASLR/control
index 7bd2d16..374cbf6 100644
--- a/client/site_tests/security_ASLR/control
+++ b/client/site_tests/security_ASLR/control
@@ -11,7 +11,7 @@
 CRITERIA = (" Fail if a process can't restart or has address range starts"
     "for any executable stack, or heap memory map to the same location"
     "after restarting")
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_AccountsBaseline/control b/client/site_tests/security_AccountsBaseline/control
index 81385b1..5c5b8c4 100644
--- a/client/site_tests/security_AccountsBaseline/control
+++ b/client/site_tests/security_AccountsBaseline/control
@@ -10,7 +10,7 @@
 PURPOSE = ("To ensure required accounts consistently appear with the same "
            "name:uid# mapping")
 CRITERIA = "Fail if the list of uid/gid doesn't match the baseline."
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_ChromiumOSLSM/control b/client/site_tests/security_ChromiumOSLSM/control
index 3881182..3f3b5e3 100644
--- a/client/site_tests/security_ChromiumOSLSM/control
+++ b/client/site_tests/security_ChromiumOSLSM/control
@@ -10,7 +10,7 @@
 """
 AUTHOR = "ups@chromium.org (Stephan Uphoff)"
 TIME = "SHORT"
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "security"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_DbusOwners/control b/client/site_tests/security_DbusOwners/control
index d2e42a3..b84b005 100644
--- a/client/site_tests/security_DbusOwners/control
+++ b/client/site_tests/security_DbusOwners/control
@@ -12,7 +12,7 @@
 CRITERIA = """
 Fail if the list of interfaces owned by chronos doesn't match the baseline
 """
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_EnableChromeTesting/control b/client/site_tests/security_EnableChromeTesting/control
index f9265f4..f9e82db 100644
--- a/client/site_tests/security_EnableChromeTesting/control
+++ b/client/site_tests/security_EnableChromeTesting/control
@@ -7,7 +7,7 @@
 PURPOSE = "Verify that EnableChromeTesting is root only."
 CRITERIA = "Fail if the EnableChromeTesting DBus call can be called by chronos."
 TIME="SHORT"
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "security"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_Firewall/control b/client/site_tests/security_Firewall/control
index c66cca4..0a162f5 100644
--- a/client/site_tests/security_Firewall/control
+++ b/client/site_tests/security_Firewall/control
@@ -8,7 +8,7 @@
 NAME = "security_Firewall"
 PURPOSE = "To keep strict (paranoid) firewall settings."
 CRITERIA = "Fail if firewall settings don't match the baseline."
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_HardlinkRestrictions/control b/client/site_tests/security_HardlinkRestrictions/control
index 7c13944..8ed02a2 100644
--- a/client/site_tests/security_HardlinkRestrictions/control
+++ b/client/site_tests/security_HardlinkRestrictions/control
@@ -7,7 +7,7 @@
 PURPOSE = "Verify hardlink restrictions introduced by the Yama LSM"
 CRITERIA = "Fails if kernel lacks hardlink restrictions"
 TIME = "SHORT"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "security"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_Minijail0/control b/client/site_tests/security_Minijail0/control
index 840e613..52eca12 100644
--- a/client/site_tests/security_Minijail0/control
+++ b/client/site_tests/security_Minijail0/control
@@ -12,7 +12,7 @@
 CRITERIA = """
 Fail if any of the minijail0 features fail to isolate properly.
 """
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_Minijail_seccomp/control b/client/site_tests/security_Minijail_seccomp/control
index c89a4f0..0ad8d5f 100644
--- a/client/site_tests/security_Minijail_seccomp/control
+++ b/client/site_tests/security_Minijail_seccomp/control
@@ -17,6 +17,6 @@
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
 JOB_RETRIES = 1
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 
 job.run_test("security_Minijail_seccomp")
diff --git a/client/site_tests/security_ModuleLocking/control b/client/site_tests/security_ModuleLocking/control
index 1099ad3..2e0edfe 100644
--- a/client/site_tests/security_ModuleLocking/control
+++ b/client/site_tests/security_ModuleLocking/control
@@ -7,7 +7,7 @@
 PURPOSE = "Verify kernel module loading restrictions"
 CRITERIA = "Fails if kernel loads modules outside of root filesystem"
 TIME = "SHORT"
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "security"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_NetworkListeners/control b/client/site_tests/security_NetworkListeners/control
index a25aab5..952ebf8 100644
--- a/client/site_tests/security_NetworkListeners/control
+++ b/client/site_tests/security_NetworkListeners/control
@@ -13,7 +13,7 @@
 Fail if the list of processes listening on the network doesn't match the
 baseline
 """
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_OpenFDs/control b/client/site_tests/security_OpenFDs/control
index e99c2c7..cdf6a56 100644
--- a/client/site_tests/security_OpenFDs/control
+++ b/client/site_tests/security_OpenFDs/control
@@ -9,7 +9,7 @@
 PURPOSE = ("To ensure unnecessary open file descriptors don't undermine"
            "sandboxing or create other security weaknesses.")
 CRITERIA = "Fail if the list of open fds seen doesn't match the expected set."
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_OpenSSLBlacklist/control b/client/site_tests/security_OpenSSLBlacklist/control
index 406422b..c4eedf1 100644
--- a/client/site_tests/security_OpenSSLBlacklist/control
+++ b/client/site_tests/security_OpenSSLBlacklist/control
@@ -16,7 +16,7 @@
 TEST_CATEGORY = 'Functional'
 TEST_TYPE = 'client'
 JOB_RETRIES = 1
-SUITE = 'bvt-inline, bvt, bvt_cq, smoke'
+SUITE = 'bvt-inline, smoke'
 
 job.run_test('security_OpenSSLBlacklist', opts=args)
 
diff --git a/client/site_tests/security_OpenSSLRegressions/control b/client/site_tests/security_OpenSSLRegressions/control
index 50f6a7b..d11bc70 100644
--- a/client/site_tests/security_OpenSSLRegressions/control
+++ b/client/site_tests/security_OpenSSLRegressions/control
@@ -17,7 +17,7 @@
 TEST_CATEGORY = 'Functional'
 TEST_TYPE = 'client'
 JOB_RETRIES = 1
-SUITE = 'bvt-inline, bvt, bvt_cq, smoke'
+SUITE = 'bvt-inline, smoke'
 
 job.run_test('security_OpenSSLRegressions', opts=args)
 
diff --git a/client/site_tests/security_ProfilePermissions/control b/client/site_tests/security_ProfilePermissions/control
index 43d6409..d790e15 100644
--- a/client/site_tests/security_ProfilePermissions/control
+++ b/client/site_tests/security_ProfilePermissions/control
@@ -12,7 +12,7 @@
 CRITERIA = """
 Fail if there are any files or directories writable by group/other in ~.
 """
-SUITE = "bvt-inline, bvt, bvt_cq"
+SUITE = "bvt-inline"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_ProtocolFamilies/control b/client/site_tests/security_ProtocolFamilies/control
index e7cad3e..277f7b9 100644
--- a/client/site_tests/security_ProtocolFamilies/control
+++ b/client/site_tests/security_ProtocolFamilies/control
@@ -8,7 +8,7 @@
 NAME = "security_ProtocolFamilies"
 PURPOSE = "To ensure no crazy protocol families are available on the system."
 CRITERIA = "Fail if an available protocol family is not in the baseline."
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_RestartJob/control b/client/site_tests/security_RestartJob/control
index 7c24def..79ed6f4 100644
--- a/client/site_tests/security_RestartJob/control
+++ b/client/site_tests/security_RestartJob/control
@@ -13,7 +13,7 @@
 CRITERIA = """
 Fail if we are able to launch an arbitrary process via RestartJob.
 """
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Security"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_RootCA/control b/client/site_tests/security_RootCA/control
index 6e677ed..456df17 100644
--- a/client/site_tests/security_RootCA/control
+++ b/client/site_tests/security_RootCA/control
@@ -12,7 +12,7 @@
 CRITERIA = """
 Fail if the nss/openssl databases fail to match each other or the whitelist.
 """
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = 'security'
 TEST_CATEGORY = 'Functional'
 TEST_TYPE = 'client'
diff --git a/client/site_tests/security_RootfsStatefulSymlinks/control b/client/site_tests/security_RootfsStatefulSymlinks/control
index aa6c9fe..b3680a6 100644
--- a/client/site_tests/security_RootfsStatefulSymlinks/control
+++ b/client/site_tests/security_RootfsStatefulSymlinks/control
@@ -17,7 +17,7 @@
 The test succeeds if all links pointing into "bad destinations" are
 accounted for by the whitelist ('baseline').
 """
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_RuntimeExecStack/control b/client/site_tests/security_RuntimeExecStack/control
index 59813da..5027d27 100644
--- a/client/site_tests/security_RuntimeExecStack/control
+++ b/client/site_tests/security_RuntimeExecStack/control
@@ -10,7 +10,7 @@
 NAME = "security_RuntimeExecStack"
 PURPOSE = "To ensure running processes have non-executable stack"
 CRITERIA = ("Fail if a process has an executable stack")
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_SandboxLinuxUnittests/control b/client/site_tests/security_SandboxLinuxUnittests/control
index 1c11f4d..98d266d 100644
--- a/client/site_tests/security_SandboxLinuxUnittests/control
+++ b/client/site_tests/security_SandboxLinuxUnittests/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "The Chromium OS Authors"
 NAME = "security_SandboxLinuxUnittests"
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "security"
diff --git a/client/site_tests/security_SandboxStatus/control b/client/site_tests/security_SandboxStatus/control
index e993890..0786b7f 100644
--- a/client/site_tests/security_SandboxStatus/control
+++ b/client/site_tests/security_SandboxStatus/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "jorgelo"
 NAME = "security_SandboxStatus"
-SUITE = "bvt-inline, bvt, bvt_cq"
+SUITE = "bvt-inline"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "security"
diff --git a/client/site_tests/security_SandboxedServices/control b/client/site_tests/security_SandboxedServices/control
index 9f68ff2..f6b30a4 100644
--- a/client/site_tests/security_SandboxedServices/control
+++ b/client/site_tests/security_SandboxedServices/control
@@ -8,7 +8,7 @@
 NAME = "security_SandboxedServices"
 PURPOSE = "To maintain sensitive system services correctly sandboxed."
 CRITERIA = "Fail if any running service does not match the baseline."
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_SuidBinaries/control b/client/site_tests/security_SuidBinaries/control
index d8cc83f..910670a 100644
--- a/client/site_tests/security_SuidBinaries/control
+++ b/client/site_tests/security_SuidBinaries/control
@@ -12,7 +12,7 @@
 CRITERIA = """
 Fail if the list of setuid/gid binaries doesn't match the baseline
 """
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_SymlinkRestrictions/control b/client/site_tests/security_SymlinkRestrictions/control
index 75b43c8..dd1e433 100644
--- a/client/site_tests/security_SymlinkRestrictions/control
+++ b/client/site_tests/security_SymlinkRestrictions/control
@@ -7,7 +7,7 @@
 PURPOSE = "Verify symlink restrictions introduced by the Yama LSM"
 CRITERIA = "Fails if kernel lacks symlink restrictions"
 TIME = "SHORT"
-SUITE = "bvt-inline, bvt, bvt_cq, smoke"
+SUITE = "bvt-inline, smoke"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "security"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_SysLogPermissions/control b/client/site_tests/security_SysLogPermissions/control
index 9aea1d5..9e0723b 100644
--- a/client/site_tests/security_SysLogPermissions/control
+++ b/client/site_tests/security_SysLogPermissions/control
@@ -12,7 +12,7 @@
 CRITERIA = """
 Fail if system logfiles have the wrong permissions.
 """
-SUITE = "bvt-inline, smoke, bvt, bvt_cq"
+SUITE = "bvt-inline, smoke"
 TEST_CLASS = "security"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/security_ptraceRestrictions/control b/client/site_tests/security_ptraceRestrictions/control
index eebe2ef..1a858b9 100644
--- a/client/site_tests/security_ptraceRestrictions/control
+++ b/client/site_tests/security_ptraceRestrictions/control
@@ -7,7 +7,7 @@
 PURPOSE = "Verify ptrace restrictions introduced by the Yama LSM"
 CRITERIA = "Fails if kernel lacks ptrace restrictions"
 TIME = "SHORT"
-SUITE = "bvt-inline, bvt, bvt_cq"
+SUITE = "bvt-inline"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "security"
 TEST_TYPE = "client"
diff --git a/client/site_tests/telemetry_LoginTest/control b/client/site_tests/telemetry_LoginTest/control
index ff7f855..a5e50c4 100644
--- a/client/site_tests/telemetry_LoginTest/control
+++ b/client/site_tests/telemetry_LoginTest/control
@@ -10,7 +10,7 @@
 the autotest extension doesn't load/is inaccessible, or if
 chrome.autotestPrivate.loginStatus doesn't work.
 """
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "login"
diff --git a/client/site_tests/touch_ScrollDirection/control b/client/site_tests/touch_ScrollDirection/control
index 71a908c..18966ed 100644
--- a/client/site_tests/touch_ScrollDirection/control
+++ b/client/site_tests/touch_ScrollDirection/control
@@ -9,7 +9,7 @@
 This test will fail if, after playback of touch events, no scrolling is detected
 or if scrolling is in the wrong direction.
 """
-SUITE = "bvt-perbuild, qav"
+SUITE = "bvt-perbuild"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "touch"
diff --git a/client/site_tests/video_ChromeHWDecodeUsed/control.h264 b/client/site_tests/video_ChromeHWDecodeUsed/control.h264
index 03a9980..fdb9fdd 100644
--- a/client/site_tests/video_ChromeHWDecodeUsed/control.h264
+++ b/client/site_tests/video_ChromeHWDecodeUsed/control.h264
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if VDA doesn't work with Chrome navigating to an mp4 file.
 """
-SUITE = "bvt-cq, bvt, bvt_cq, video"
+SUITE = "bvt-cq, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_ChromeHWDecodeUsed/control.h264.mse b/client/site_tests/video_ChromeHWDecodeUsed/control.h264.mse
index 68aba38..d435b3f 100644
--- a/client/site_tests/video_ChromeHWDecodeUsed/control.h264.mse
+++ b/client/site_tests/video_ChromeHWDecodeUsed/control.h264.mse
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if VDA doesn't work with Chrome navigating to an MSE mp4 file.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_ChromeHWDecodeUsed/control.vp8 b/client/site_tests/video_ChromeHWDecodeUsed/control.vp8
index 0dc5727..557c877 100644
--- a/client/site_tests/video_ChromeHWDecodeUsed/control.vp8
+++ b/client/site_tests/video_ChromeHWDecodeUsed/control.vp8
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if VDA doesn't work with Chrome navigating to a webm file.
 """
-SUITE = "bvt-cq, bvt, bvt_cq, video"
+SUITE = "bvt-cq, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_ChromeHWDecodeUsed/control.vp8.mse b/client/site_tests/video_ChromeHWDecodeUsed/control.vp8.mse
index 247661d..88c2938 100644
--- a/client/site_tests/video_ChromeHWDecodeUsed/control.vp8.mse
+++ b/client/site_tests/video_ChromeHWDecodeUsed/control.vp8.mse
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if VDA doesn't work with Chrome navigating to an MSE webm file.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_ChromeRTCHWDecodeUsed/control b/client/site_tests/video_ChromeRTCHWDecodeUsed/control
index c2f2c9c..fee0596 100644
--- a/client/site_tests/video_ChromeRTCHWDecodeUsed/control
+++ b/client/site_tests/video_ChromeRTCHWDecodeUsed/control
@@ -5,7 +5,7 @@
 AUTHOR = "Chrome OS Project, chromeos-video@google.com"
 NAME = "video_ChromeRTCHWDecodeUsed"
 PURPOSE = "Verify that HW decoding works for WebRTC/vp8 video."
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_ChromeRTCHWEncodeUsed/control b/client/site_tests/video_ChromeRTCHWEncodeUsed/control
index a663c47..a04d064 100644
--- a/client/site_tests/video_ChromeRTCHWEncodeUsed/control
+++ b/client/site_tests/video_ChromeRTCHWEncodeUsed/control
@@ -5,7 +5,7 @@
 AUTHOR = "Chrome OS Project, chromeos-video@google.com"
 NAME = "video_ChromeRTCHWEncodeUsed"
 PURPOSE = "Verify that HW Encoding works for WebRTC/vp8 video."
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_ChromeVidResChangeHWDecode/control.h264 b/client/site_tests/video_ChromeVidResChangeHWDecode/control.h264
index 508ac36..98310ca 100644
--- a/client/site_tests/video_ChromeVidResChangeHWDecode/control.h264
+++ b/client/site_tests/video_ChromeVidResChangeHWDecode/control.h264
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if VDA doesn't work for mp4 resolution-changing video.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_ChromeVidResChangeHWDecode/control.vp8 b/client/site_tests/video_ChromeVidResChangeHWDecode/control.vp8
index 297eaab..6143bde 100644
--- a/client/site_tests/video_ChromeVidResChangeHWDecode/control.vp8
+++ b/client/site_tests/video_ChromeVidResChangeHWDecode/control.vp8
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if VDA doesn't work for webm resolution-changing video.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_GlitchDetection/control.mp4.480p b/client/site_tests/video_GlitchDetection/control.mp4.480p
index 4a56c86..50dfd3c 100644
--- a/client/site_tests/video_GlitchDetection/control.mp4.480p
+++ b/client/site_tests/video_GlitchDetection/control.mp4.480p
@@ -8,7 +8,7 @@
 CRITERIA = """
 
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "LONG"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_GlitchDetection/control.webm.480p b/client/site_tests/video_GlitchDetection/control.webm.480p
index 75e86f8..6774cbe 100644
--- a/client/site_tests/video_GlitchDetection/control.webm.480p
+++ b/client/site_tests/video_GlitchDetection/control.webm.480p
@@ -8,7 +8,7 @@
 CRITERIA = """
 
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "LONG"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_MultiplePlayback/control b/client/site_tests/video_MultiplePlayback/control
index 090a00f..160a91d 100755
--- a/client/site_tests/video_MultiplePlayback/control
+++ b/client/site_tests/video_MultiplePlayback/control
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if video playback fails in any tab.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VDAPerf/control.h264 b/client/site_tests/video_VDAPerf/control.h264
index da78f17..fe8989d 100644
--- a/client/site_tests/video_VDAPerf/control.h264
+++ b/client/site_tests/video_VDAPerf/control.h264
@@ -8,7 +8,7 @@
 CRITERIA = """
 The test fails if the video_decode_accelerator_unittest fails or crashes.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VDAPerf/control.vp8 b/client/site_tests/video_VDAPerf/control.vp8
index 6d7a3bc..196e76a 100644
--- a/client/site_tests/video_VDAPerf/control.vp8
+++ b/client/site_tests/video_VDAPerf/control.vp8
@@ -8,7 +8,7 @@
 CRITERIA = """
 The test fails if the video_decode_accelerator_unittest fails or crashes.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VideoCorruption/control.h264 b/client/site_tests/video_VideoCorruption/control.h264
index a6b9a7f..1db3503 100644
--- a/client/site_tests/video_VideoCorruption/control.h264
+++ b/client/site_tests/video_VideoCorruption/control.h264
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if Chrome fails to catch error for playing corrupted mp4 video.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VideoCorruption/control.vp8 b/client/site_tests/video_VideoCorruption/control.vp8
index c923299..506d6d0 100644
--- a/client/site_tests/video_VideoCorruption/control.vp8
+++ b/client/site_tests/video_VideoCorruption/control.vp8
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if Chrome fails to catch error for playing corrupted webm video.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VideoDecodeAccelerator/control.h264 b/client/site_tests/video_VideoDecodeAccelerator/control.h264
index 59287a7..6195041 100644
--- a/client/site_tests/video_VideoDecodeAccelerator/control.h264
+++ b/client/site_tests/video_VideoDecodeAccelerator/control.h264
@@ -10,7 +10,7 @@
 fails. Running video_decode_accelerator_unittest is skipped on machines that are
 known not to support video decode.
 """
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VideoReload/control.h264 b/client/site_tests/video_VideoReload/control.h264
index d8a40a8..bebef65 100644
--- a/client/site_tests/video_VideoReload/control.h264
+++ b/client/site_tests/video_VideoReload/control.h264
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if Chrome fails to reload mp4 video.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VideoReload/control.vp8 b/client/site_tests/video_VideoReload/control.vp8
index 8f26fad..3f12aae 100644
--- a/client/site_tests/video_VideoReload/control.vp8
+++ b/client/site_tests/video_VideoReload/control.vp8
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if Chrome fails to reload webm video.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VideoSeek/control.h264 b/client/site_tests/video_VideoSeek/control.h264
index bb32812..e5c5736 100644
--- a/client/site_tests/video_VideoSeek/control.h264
+++ b/client/site_tests/video_VideoSeek/control.h264
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if a non-resolution-changing H264 video fails to seek in Chrome HTML5 page.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VideoSeek/control.h264.switchres b/client/site_tests/video_VideoSeek/control.h264.switchres
index 0a2b97f..a39eab9 100644
--- a/client/site_tests/video_VideoSeek/control.h264.switchres
+++ b/client/site_tests/video_VideoSeek/control.h264.switchres
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if a resolution-changing H264 video fails to seek in Chrome HTML5 page.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VideoSeek/control.vp8 b/client/site_tests/video_VideoSeek/control.vp8
index 3895927..28aae2e 100644
--- a/client/site_tests/video_VideoSeek/control.vp8
+++ b/client/site_tests/video_VideoSeek/control.vp8
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if a non-resolution-changing VP8 video fails to seek in Chrome HTML5 page.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VideoSeek/control.vp8.switchres b/client/site_tests/video_VideoSeek/control.vp8.switchres
index b3ee32d..5e25f30 100644
--- a/client/site_tests/video_VideoSeek/control.vp8.switchres
+++ b/client/site_tests/video_VideoSeek/control.vp8.switchres
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if a resolution-changing VP8 video fails to seek in Chrome HTML5 page.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_VimeoVideo/control b/client/site_tests/video_VimeoVideo/control
index 0f40575..77fd8c2 100644
--- a/client/site_tests/video_VimeoVideo/control
+++ b/client/site_tests/video_VimeoVideo/control
@@ -11,7 +11,7 @@
 CRITERIA = """
 This test will fail if Vimeo video fails to play.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_WebRtcPerf/control b/client/site_tests/video_WebRtcPerf/control
index 515ede2..c36d864 100644
--- a/client/site_tests/video_WebRtcPerf/control
+++ b/client/site_tests/video_WebRtcPerf/control
@@ -8,7 +8,7 @@
 CRITERIA = """
 The test output video decode time for WebRtc to performance dashboard.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubeFlash/control b/client/site_tests/video_YouTubeFlash/control
index 65ccc00..fae1226 100644
--- a/client/site_tests/video_YouTubeFlash/control
+++ b/client/site_tests/video_YouTubeFlash/control
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if YouTube Flash video fails to play.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubeHTML5/control b/client/site_tests/video_YouTubeHTML5/control
index 1b04f87..b0b2a79 100644
--- a/client/site_tests/video_YouTubeHTML5/control
+++ b/client/site_tests/video_YouTubeHTML5/control
@@ -8,7 +8,7 @@
 CRITERIA = """
 This test will fail if YouTube HTML5 video fails to play.
 """
-SUITE = "bvt-perbuild, video, qav"
+SUITE = "bvt-perbuild, video"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
diff --git a/server/site_tests/autoupdate_CatchBadSignatures/control b/server/site_tests/autoupdate_CatchBadSignatures/control
index bc9f3fc..6ffade2 100644
--- a/server/site_tests/autoupdate_CatchBadSignatures/control
+++ b/server/site_tests/autoupdate_CatchBadSignatures/control
@@ -11,7 +11,7 @@
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
 JOB_RETRIES = 1
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 
 DOC = """
 This is a test to verify that update_engine correctly checks
diff --git a/server/site_tests/enterprise_RemoraRequisitionServer/control b/server/site_tests/enterprise_RemoraRequisitionServer/control
index 4262399..0713b7e 100644
--- a/server/site_tests/enterprise_RemoraRequisitionServer/control
+++ b/server/site_tests/enterprise_RemoraRequisitionServer/control
@@ -8,7 +8,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "enterprise"
 TEST_TYPE = "server"
-SUITE="bvt-perbuild, bvt"
+SUITE="bvt-perbuild"
 
 DOC = """
 This test clears the TPM if necessary, kicks off a client side test that enrolls
diff --git a/server/site_tests/platform_UReadAheadServer/control b/server/site_tests/platform_UReadAheadServer/control
index 5ce12ad..604c80e 100644
--- a/server/site_tests/platform_UReadAheadServer/control
+++ b/server/site_tests/platform_UReadAheadServer/control
@@ -8,7 +8,7 @@
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
 JOB_RETRIES = 1
-SUITE = "bvt-cq, bvt, bvt_cq"
+SUITE = "bvt-cq"
 
 DOC = """
 This test deletes the existing ureadahead pack files from the client, reboots
diff --git a/test_suites/control.bvt b/test_suites/control.bvt
deleted file mode 100644
index 4bcec9e..0000000
--- a/test_suites/control.bvt
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt"
-PURPOSE = "Test basic, required functionality."
-CRITERIA = "All tests with SUITE=bvt must pass."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the Build Verification Test suite. It should consist of SHORT tests
-that validate critical functionality. Critical functionality includes but is
-not limited to tests that cover the ability to acquire connectivity, perform
--crash reporting, get updates, and allow a user to log in. A test failure in
-this suite means that the build is dead in the water and will not be passed
-on to QA. Tests that check critical pathways but are long running need to be
-pared down and added to this suite on a case by case basis. The longer running
-version can continue to run in other suites such as the regression suite. If you
-are unsure if your test belongs in this suite email:
-chromeos-lab-infrastructure@google.com.
-
-This suite sets num to 4 in the reimage_and_run call to make sure we run
-across 4 different machines. This overrides the CROS.sharding_factor option in
-the global_config.
-
-
-@param build: The name of the image to test.
-              Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
-             board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros import provision
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
-    'labels': ['bvt'],
-    'owner': '',
-    'status': None,
-    'summary': None,
-    'title': None,
-    'ccs': ['beeps@chromium.org', 'chromeos-lab-errors@google.com']
-}
-
-dynamic_suite.reimage_and_run(
-    build=build, board=board, name='bvt', job=job, pool=pool,
-    check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
-    max_runtime_mins=20, bug_template=_BUG_TEMPLATE,
-    devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
-    wait_for_results=wait_for_results, job_retry=job_retry)
diff --git a/test_suites/control.bvt_cq b/test_suites/control.bvt_cq
deleted file mode 100644
index 1f97cf2..0000000
--- a/test_suites/control.bvt_cq
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt_cq"
-PURPOSE = "Test basic, required functionality."
-CRITERIA = "All tests with SUITE=bvt_cq must pass."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the Build Verification Test suite for commit queue. It should consist of
-SHORT tests that validate critical functionality. Critical functionality
-includes but is not limited to tests that cover the ability to acquire
-connectivity, perform-crash reporting, get updates, and allow a user to log in.
-A test failure in this suite means that the build is dead in the water and will
-not be passed on to QA. Tests that check critical pathways but are long running
-need to be pared down and added to this suite on a case by case basis. The
-longer running version can continue to run in other suites such as the
-regression suite. If you are unsure if your test belongs in this suite email:
-chromeos-lab-infrastructure@google.com.
-
-This suite sets num to 4 in the reimage_and_run call to make sure we run
-across 4 different machines. This overrides the CROS.sharding_factor option in
-the global_config.
-
-
-@param build: The name of the image to test.
-              Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
-             board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros import provision
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
-    'labels': ['bvt_cq'],
-    'owner': '',
-    'status': None,
-    'summary': None,
-    'title': None,
-    'ccs': ['chromeos-lab-errors@google.com']
-}
-
-dynamic_suite.reimage_and_run(
-    build=build, board=board, name='bvt_cq', job=job, pool=pool,
-    check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
-    max_runtime_mins=20, bug_template=_BUG_TEMPLATE,
-    devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
-    wait_for_results=wait_for_results, job_retry=job_retry)
diff --git a/test_suites/control.qav b/test_suites/control.qav
deleted file mode 100644
index 74d027b..0000000
--- a/test_suites/control.qav
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "Chrome OS Test chromeos-test-team@"
-NAME = "qav"
-PURPOSE = "Validate quality of build before release."
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the QA Validation suite.
-
-Add tests to this suite that are used to give a signal regarding the quality
-of a feature or area on Chrome OS that should run every build.
-
-These tests are only run on full release builds, not on the commit queue.
-
-@param build: The name of the image to test.
-              Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
-             board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-from autotest_lib.server.cros import provision
-
-
-dynamic_suite.reimage_and_run(
-    build=build, board=board, name='qav', job=job, pool=pool,
-    check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
-    max_runtime_mins=120, devserver_url=devserver_url,
-    version_prefix=provision.CROS_VERSION_PREFIX,
-    wait_for_results=wait_for_results, job_retry=job_retry)