diff --git a/client/site_tests/cheets_StartAndroid/control.stress.1 b/client/site_tests/cheets_StartAndroid/control.stress.1
index d064374..82a6667 100644
--- a/client/site_tests/cheets_StartAndroid/control.stress.1
+++ b/client/site_tests/cheets_StartAndroid/control.stress.1
@@ -4,9 +4,7 @@
 #
 
 AUTHOR = "ARC Team"
-# Do not remove any of these suites without wider discussion as it will cause
-# instability in the testing lab.
-ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
+ATTRIBUTES = "suite:bvt-perbuild"
 NAME = "cheets_StartAndroid.stress.1"
 TIME = "LONG"
 TEST_CATEGORY = "Stress"
diff --git a/client/site_tests/cheets_StartAndroid/control.stress.2 b/client/site_tests/cheets_StartAndroid/control.stress.2
index 378cbc8..2cc3c57 100644
--- a/client/site_tests/cheets_StartAndroid/control.stress.2
+++ b/client/site_tests/cheets_StartAndroid/control.stress.2
@@ -4,9 +4,7 @@
 #
 
 AUTHOR = "ARC Team"
-# Do not remove any of these suites without wider discussion as it will cause
-# instability in the testing lab.
-ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
+ATTRIBUTES = "suite:bvt-perbuild"
 NAME = "cheets_StartAndroid.stress.2"
 TIME = "LONG"
 TEST_CATEGORY = "Stress"
diff --git a/client/site_tests/cheets_StartAndroid/control.stress.3 b/client/site_tests/cheets_StartAndroid/control.stress.3
index d581c484..3d47ba9 100644
--- a/client/site_tests/cheets_StartAndroid/control.stress.3
+++ b/client/site_tests/cheets_StartAndroid/control.stress.3
@@ -4,9 +4,7 @@
 #
 
 AUTHOR = "ARC Team"
-# Do not remove any of these suites without wider discussion as it will cause
-# instability in the testing lab.
-ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
+ATTRIBUTES = "suite:bvt-perbuild"
 NAME = "cheets_StartAndroid.stress.3"
 TIME = "LONG"
 TEST_CATEGORY = "Stress"
diff --git a/client/site_tests/cheets_StartAndroid/control.stress.4 b/client/site_tests/cheets_StartAndroid/control.stress.4
index 76113c0..8637f34 100644
--- a/client/site_tests/cheets_StartAndroid/control.stress.4
+++ b/client/site_tests/cheets_StartAndroid/control.stress.4
@@ -4,9 +4,7 @@
 #
 
 AUTHOR = "ARC Team"
-# Do not remove any of these suites without wider discussion as it will cause
-# instability in the testing lab.
-ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
+ATTRIBUTES = "suite:bvt-perbuild"
 NAME = "cheets_StartAndroid.stress.4"
 TIME = "LONG"
 TEST_CATEGORY = "Stress"
diff --git a/client/site_tests/cheets_StartAndroid/control.stress.5 b/client/site_tests/cheets_StartAndroid/control.stress.5
index 1f1c334..e4f5afb 100644
--- a/client/site_tests/cheets_StartAndroid/control.stress.5
+++ b/client/site_tests/cheets_StartAndroid/control.stress.5
@@ -4,9 +4,7 @@
 #
 
 AUTHOR = "ARC Team"
-# Do not remove any of these suites without wider discussion as it will cause
-# instability in the testing lab.
-ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
+ATTRIBUTES = "suite:bvt-perbuild"
 NAME = "cheets_StartAndroid.stress.5"
 TIME = "LONG"
 TEST_CATEGORY = "Stress"
diff --git a/client/site_tests/cheets_StartAndroid/control.stress.6 b/client/site_tests/cheets_StartAndroid/control.stress.6
index 00d9387..df1db3f 100644
--- a/client/site_tests/cheets_StartAndroid/control.stress.6
+++ b/client/site_tests/cheets_StartAndroid/control.stress.6
@@ -4,9 +4,7 @@
 #
 
 AUTHOR = "ARC Team"
-# Do not remove any of these suites without wider discussion as it will cause
-# instability in the testing lab.
-ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
+ATTRIBUTES = "suite:bvt-perbuild"
 NAME = "cheets_StartAndroid.stress.6"
 TIME = "LONG"
 TEST_CATEGORY = "Stress"
diff --git a/client/site_tests/cheets_StartAndroid/control.stress.7 b/client/site_tests/cheets_StartAndroid/control.stress.7
index 75a96b6..618cc5b 100644
--- a/client/site_tests/cheets_StartAndroid/control.stress.7
+++ b/client/site_tests/cheets_StartAndroid/control.stress.7
@@ -4,9 +4,7 @@
 #
 
 AUTHOR = "ARC Team"
-# Do not remove any of these suites without wider discussion as it will cause
-# instability in the testing lab.
-ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
+ATTRIBUTES = "suite:bvt-perbuild"
 NAME = "cheets_StartAndroid.stress.7"
 TIME = "LONG"
 TEST_CATEGORY = "Stress"
diff --git a/client/site_tests/cheets_StartAndroid/control.stress.8 b/client/site_tests/cheets_StartAndroid/control.stress.8
index 4c908a6..a0fdf4b 100644
--- a/client/site_tests/cheets_StartAndroid/control.stress.8
+++ b/client/site_tests/cheets_StartAndroid/control.stress.8
@@ -4,9 +4,7 @@
 #
 
 AUTHOR = "ARC Team"
-# Do not remove any of these suites without wider discussion as it will cause
-# instability in the testing lab.
-ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
+ATTRIBUTES = "suite:bvt-perbuild"
 NAME = "cheets_StartAndroid.stress.8"
 TIME = "LONG"
 TEST_CATEGORY = "Stress"
diff --git a/client/site_tests/cheets_StartAndroid/control.stress.9 b/client/site_tests/cheets_StartAndroid/control.stress.9
index 3475269..9a60bf6 100644
--- a/client/site_tests/cheets_StartAndroid/control.stress.9
+++ b/client/site_tests/cheets_StartAndroid/control.stress.9
@@ -4,9 +4,7 @@
 #
 
 AUTHOR = "ARC Team"
-# Do not remove any of these suites without wider discussion as it will cause
-# instability in the testing lab.
-ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
+ATTRIBUTES = "suite:bvt-perbuild"
 NAME = "cheets_StartAndroid.stress.9"
 TIME = "LONG"
 TEST_CATEGORY = "Stress"