diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.top_25_smooth b/server/site_tests/telemetry_Benchmarks/control.smoothness.top_25_smooth
index 8de1fdc..dd029b7 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.top_25_smooth
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.top_25_smooth
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.smoothness.top_25_smooth'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
@@ -29,4 +29,4 @@
                  tag='smoothness.top_25_smooth',
                  args=utils.args_to_dict(args))
 
-parallel_simple(run_benchmark, machines)
\ No newline at end of file
+parallel_simple(run_benchmark, machines)
diff --git a/server/site_tests/telemetry_Benchmarks/control.tab_switching.top_10 b/server/site_tests/telemetry_Benchmarks/control.tab_switching.top_10
index ec3c027..3571b8a 100644
--- a/server/site_tests/telemetry_Benchmarks/control.tab_switching.top_10
+++ b/server/site_tests/telemetry_Benchmarks/control.tab_switching.top_10
@@ -4,13 +4,13 @@
 
 from autotest_lib.client.common_lib import utils
 
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.tab_switching.top_10"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.tab_switching.top_10'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
 
 DOC = """
 This server side test suite executes the Telemetry tab paint performance test