diff --git a/client/site_tests/graphics_dEQP/control.gles2.accuracy b/client/site_tests/graphics_dEQP/control.gles2.accuracy
index b13cdf8..d08f0f7 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.accuracy
+++ b/client/site_tests/graphics_dEQP/control.gles2.accuracy
@@ -8,8 +8,8 @@
 CRITERIA = """
 All of the individual tests must pass.
 """
-ATTRIBUTES = "suite:graphics_per-day"
-SUITE = 'graphics_per-day'
+ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
+SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
 TIME = 'FAST'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.capability b/client/site_tests/graphics_dEQP/control.gles2.capability
index d0f95b7..d87486a 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.capability
+++ b/client/site_tests/graphics_dEQP/control.gles2.capability
@@ -8,8 +8,8 @@
 CRITERIA = """
 All of the individual tests must pass.
 """
-ATTRIBUTES = "suite:graphics_per-day"
-SUITE = 'graphics_per-day'
+ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
+SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
 TIME = 'FAST'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty
index a1ef12d..0568e0a 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty
@@ -8,9 +8,9 @@
 CRITERIA = """
 All of the individual tests must pass.
 """
-ATTRIBUTES = "suite:graphics_per-build"
-SUITE = 'graphics_per-build'
-TIME = 'LENGTHY'
+ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
+SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+TIME = 'MEDIUM'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
 TEST_TYPE = 'client'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.info b/client/site_tests/graphics_dEQP/control.gles2.info
index 63d3b1b..cf11297 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.info
+++ b/client/site_tests/graphics_dEQP/control.gles2.info
@@ -8,8 +8,8 @@
 CRITERIA = """
 All of the individual tests must pass.
 """
-ATTRIBUTES = "suite:graphics_per-day"
-SUITE = 'graphics_per-day'
+ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
+SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
 TIME = 'FAST'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.performance b/client/site_tests/graphics_dEQP/control.gles2.performance
index c8467fa..8fbf7e9 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.performance
+++ b/client/site_tests/graphics_dEQP/control.gles2.performance
@@ -8,8 +8,8 @@
 CRITERIA = """
 All of the individual tests must pass.
 """
-ATTRIBUTES = "suite:graphics_per-day"
-SUITE = 'graphics_per-day'
+ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system"
+SUITE = 'graphics_per-day, graphics_system'
 TIME = 'LENGTHY'
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.stress b/client/site_tests/graphics_dEQP/control.gles2.stress
index 1536a7c..74f743e 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.stress
+++ b/client/site_tests/graphics_dEQP/control.gles2.stress
@@ -8,8 +8,8 @@
 CRITERIA = """
 All of the individual tests must pass.
 """
-ATTRIBUTES = "suite:graphics_per-day"
-SUITE = 'graphics_per-day'
+ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
+SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
 TIME = 'LENGTHY'
 TEST_CATEGORY = 'Stress'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles3.accuracy b/client/site_tests/graphics_dEQP/control.gles3.accuracy
index e4f2832..08a3548 100644
--- a/client/site_tests/graphics_dEQP/control.gles3.accuracy
+++ b/client/site_tests/graphics_dEQP/control.gles3.accuracy
@@ -8,8 +8,8 @@
 CRITERIA = """
 All of the individual tests must pass.
 """
-ATTRIBUTES = "suite:graphics_per-day"
-SUITE = 'graphics_per-day'
+ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
+SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
 TIME = 'FAST'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles3.functional b/client/site_tests/graphics_dEQP/control.gles3.functional
index b02d95d..f62925e 100644
--- a/client/site_tests/graphics_dEQP/control.gles3.functional
+++ b/client/site_tests/graphics_dEQP/control.gles3.functional
@@ -8,8 +8,8 @@
 CRITERIA = """
 All of the individual tests must pass.
 """
-ATTRIBUTES = "suite:graphics_per-day"
-SUITE = 'graphics_per-day'
+ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system"
+SUITE = 'graphics_per-day, graphics_system'
 TIME = 'LENGTHY'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles3.info b/client/site_tests/graphics_dEQP/control.gles3.info
index 355c618..502cd43 100644
--- a/client/site_tests/graphics_dEQP/control.gles3.info
+++ b/client/site_tests/graphics_dEQP/control.gles3.info
@@ -8,8 +8,8 @@
 CRITERIA = """
 All of the individual tests must pass.
 """
-ATTRIBUTES = "suite:graphics_per-day"
-SUITE = 'graphics_per-day'
+ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
+SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
 TIME = 'FAST'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles3.performance b/client/site_tests/graphics_dEQP/control.gles3.performance
index 948856c..87970d3 100644
--- a/client/site_tests/graphics_dEQP/control.gles3.performance
+++ b/client/site_tests/graphics_dEQP/control.gles3.performance
@@ -8,8 +8,8 @@
 CRITERIA = """
 All of the individual tests must pass.
 """
-ATTRIBUTES = "suite:graphics_per-day"
-SUITE = 'graphics_per-day'
+ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system"
+SUITE = 'graphics_per-day, graphics_system'
 TIME = 'LENGTHY'
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles3.stress b/client/site_tests/graphics_dEQP/control.gles3.stress
index e14d550..c9235df 100644
--- a/client/site_tests/graphics_dEQP/control.gles3.stress
+++ b/client/site_tests/graphics_dEQP/control.gles3.stress
@@ -8,9 +8,9 @@
 CRITERIA = """
 All of the individual tests must pass.
 """
-ATTRIBUTES = "suite:graphics_per-day"
-SUITE = 'graphics_per-day'
-TIME = 'LENGTHY'
+ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system"
+SUITE = 'graphics_per-day, graphics_system'
+TIME = 'FAST'
 TEST_CATEGORY = 'Stress'
 TEST_CLASS = 'graphics'
 TEST_TYPE = 'client'