diff --git a/client/site_tests/graphics_WebGLAquarium/control b/client/site_tests/graphics_WebGLAquarium/control
index f2bfeb0..4e8b391 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, graphics_browser'
+SUITE = 'performance, graphics, graphics_browser'
 TIME = "medium"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "graphics"
diff --git a/client/site_tests/graphics_WebGLManyPlanetsDeep/control b/client/site_tests/graphics_WebGLManyPlanetsDeep/control
index 0edaa5d..7e175cd 100644
--- a/client/site_tests/graphics_WebGLManyPlanetsDeep/control
+++ b/client/site_tests/graphics_WebGLManyPlanetsDeep/control
@@ -6,7 +6,7 @@
 NAME = "graphics_WebGLManyPlanetsDeep"
 PURPOSE = "Execute the WebGL many planets deep test suite."
 CRITERIA = "All suite tests must not crash/hang."
-SUITE = 'graphics_per-day, graphics, graphics_browser'
+SUITE = 'performance, graphics_per-day, graphics, graphics_browser'
 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 53d4bdb..3e853bc 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, graphics_browser"
+SUITE = "performance, graphics, graphics_browser"
 TIME = "medium"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "graphics"
diff --git a/client/site_tests/platform_BootPerf/control b/client/site_tests/platform_BootPerf/control
index 8a50ab4..c035078 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"
+SUITE = "performance"
 TIME = "SHORT"
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_Pkcs11LoadPerf/control b/client/site_tests/platform_Pkcs11LoadPerf/control
index 6c1c60b..4fcdcba 100644
--- a/client/site_tests/platform_Pkcs11LoadPerf/control
+++ b/client/site_tests/platform_Pkcs11LoadPerf/control
@@ -4,7 +4,7 @@
 
 AUTHOR = "dkrahn"
 NAME = "platform_Pkcs11LoadPerf"
-SUITE = "bvt-perbuild"
+SUITE = "performance"
 TIME = "SHORT"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/power_Resume/control b/client/site_tests/power_Resume/control
index 6e625b1..0b80b16 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"
+SUITE = "performance"
 TIME = "SHORT"
 TEST_CATEGORY = "Logging"
 TEST_CLASS = "power"
diff --git a/client/site_tests/video_VDAPerf/control.h264 b/client/site_tests/video_VDAPerf/control.h264
index 6642f82..20e749c 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"
+SUITE = "performance"
 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 784f63f..ef2c9ae 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"
+SUITE = "performance"
 TIME = "SHORT"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_WebRtcPerf/control b/client/site_tests/video_WebRtcPerf/control
index a585072..06662dc 100644
--- a/client/site_tests/video_WebRtcPerf/control
+++ b/client/site_tests/video_WebRtcPerf/control
@@ -6,7 +6,7 @@
 NAME = "video_WebRtcPerf"
 PURPOSE = "Make sure WebRTC is hardware decode accelerated."
 CRITERIA = "Fails if hardware decode acceleration is not used."
-SUITE = "bvt-perbuild"
+SUITE = "performance"
 TIME = "SHORT"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "video"
diff --git a/server/site_tests/platform_BootPerfServer/control b/server/site_tests/platform_BootPerfServer/control
index 28c1ae6..0d14e30 100644
--- a/server/site_tests/platform_BootPerfServer/control
+++ b/server/site_tests/platform_BootPerfServer/control
@@ -4,7 +4,7 @@
 
 NAME = "BootPerfServer"
 AUTHOR = "Chrome OS Team"
-SUITE = "kernel_per-build_benchmarks"
+SUITE = "performance, kernel_per-build_benchmarks"
 TIME = "SHORT"
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "platform"
diff --git a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoreattr b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoreattr
index 62501be..894ffa0 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoreattr
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoreattr
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.dromaeo.domcoreattr'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify
index 0a7c8f5..9b8f96f 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.dromaeo.domcoremodify'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery
index eebd741..cfc2c1b 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.dromaeo.domcorequery'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse
index cec91cc..447605b 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.dromaeo.domcoretraverse'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.jetstream b/server/site_tests/telemetry_Benchmarks/control.jetstream
index 9001d49..4ac91a9 100644
--- a/server/site_tests/telemetry_Benchmarks/control.jetstream
+++ b/server/site_tests/telemetry_Benchmarks/control.jetstream
@@ -2,27 +2,31 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# Do not edit this file! It was created by generate_controlfiles.py.
+
 from autotest_lib.client.common_lib import utils
 
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.jetstream"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.jetstream'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
 
-DOC = """
-This server side test suite executes the Telemetry Jetstream Benchmark.
+DOC = '''
+This server side test suite executes the Telemetry Benchmark:
+jetstream
 This is part of Chrome for Chrome OS performance testing.
 
 Pass local=True to run with local telemetry and no AFE server.
-"""
+'''
 
 def run_benchmark(machine):
     host = hosts.create_host(machine)
-    job.run_test("telemetry_Benchmarks", host=host,
-                 benchmark="jetstream", tag="jetstream",
+    job.run_test('telemetry_Benchmarks', host=host,
+                 benchmark='jetstream',
+                 tag='jetstream',
                  args=utils.args_to_dict(args))
 
-parallel_simple(run_benchmark, machines)
+parallel_simple(run_benchmark, machines)
\ No newline at end of file
diff --git a/server/site_tests/telemetry_Benchmarks/control.kraken b/server/site_tests/telemetry_Benchmarks/control.kraken
index 072e937..fa951e6 100644
--- a/server/site_tests/telemetry_Benchmarks/control.kraken
+++ b/server/site_tests/telemetry_Benchmarks/control.kraken
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.kraken'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.media.chromeOS.tough_video_cases b/server/site_tests/telemetry_Benchmarks/control.media.chromeOS.tough_video_cases
index 01a0579..0ea0d1a 100644
--- a/server/site_tests/telemetry_Benchmarks/control.media.chromeOS.tough_video_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.media.chromeOS.tough_video_cases
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.media.chromeOS.tough_video_cases'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.media.chromeOS4kOnly.tough_video_cases b/server/site_tests/telemetry_Benchmarks/control.media.chromeOS4kOnly.tough_video_cases
index 7c1c6be..385246d 100644
--- a/server/site_tests/telemetry_Benchmarks/control.media.chromeOS4kOnly.tough_video_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.media.chromeOS4kOnly.tough_video_cases
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.media.chromeOS4kOnly.tough_video_cases'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.memory.top_7_stress b/server/site_tests/telemetry_Benchmarks/control.memory.top_7_stress
index 56c258a..c41a2c2 100644
--- a/server/site_tests/telemetry_Benchmarks/control.memory.top_7_stress
+++ b/server/site_tests/telemetry_Benchmarks/control.memory.top_7_stress
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.memory.top_7_stress'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.octane b/server/site_tests/telemetry_Benchmarks/control.octane
index 47bc888..34767cb 100644
--- a/server/site_tests/telemetry_Benchmarks/control.octane
+++ b/server/site_tests/telemetry_Benchmarks/control.octane
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.octane'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.page_cycler.typical_25 b/server/site_tests/telemetry_Benchmarks/control.page_cycler.typical_25
index ec40d86..292d7b9 100644
--- a/server/site_tests/telemetry_Benchmarks/control.page_cycler.typical_25
+++ b/server/site_tests/telemetry_Benchmarks/control.page_cycler.typical_25
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.page_cycler.typical_25'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.robohornet_pro b/server/site_tests/telemetry_Benchmarks/control.robohornet_pro
index 9e5ac99..55edd57 100644
--- a/server/site_tests/telemetry_Benchmarks/control.robohornet_pro
+++ b/server/site_tests/telemetry_Benchmarks/control.robohornet_pro
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.robohornet_pro'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.session_restore.cold.typical_25 b/server/site_tests/telemetry_Benchmarks/control.session_restore.cold.typical_25
index 04ea30d..959b173 100644
--- a/server/site_tests/telemetry_Benchmarks/control.session_restore.cold.typical_25
+++ b/server/site_tests/telemetry_Benchmarks/control.session_restore.cold.typical_25
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.session_restore.cold.typical_25'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
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 dd029b7..46c9dc7 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.top_25_smooth
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.top_25_smooth
@@ -29,4 +29,4 @@
                  tag='smoothness.top_25_smooth',
                  args=utils.args_to_dict(args))
 
-parallel_simple(run_benchmark, machines)
+parallel_simple(run_benchmark, machines)
\ No newline at end of file
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_animation_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_animation_cases
index 14c1a8b..a7bfc92 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_animation_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_animation_cases
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.smoothness.tough_animation_cases'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_canvas_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_canvas_cases
index 7c86940..b9426b0 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_canvas_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_canvas_cases
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.smoothness.tough_canvas_cases'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_filters_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_filters_cases
index 50381cc..d30099c 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_filters_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_filters_cases
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.smoothness.tough_filters_cases'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_pinch_zoom_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_pinch_zoom_cases
index 82023f5..2f8a7bb 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_pinch_zoom_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_pinch_zoom_cases
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.smoothness.tough_pinch_zoom_cases'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_scrolling_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_scrolling_cases
index 3b93418..2db208a 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_scrolling_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_scrolling_cases
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.smoothness.tough_scrolling_cases'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_webgl_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_webgl_cases
index 4906c95..cb39c03 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_webgl_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_webgl_cases
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.smoothness.tough_webgl_cases'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.speedometer b/server/site_tests/telemetry_Benchmarks/control.speedometer
index 1d87034..921d237 100644
--- a/server/site_tests/telemetry_Benchmarks/control.speedometer
+++ b/server/site_tests/telemetry_Benchmarks/control.speedometer
@@ -2,27 +2,31 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# Do not edit this file! It was created by generate_controlfiles.py.
+
 from autotest_lib.client.common_lib import utils
 
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.speedometer"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.speedometer'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
 
-DOC = """
-This server side test suite executes the Telemetry Speedometer Benchmark.
+DOC = '''
+This server side test suite executes the Telemetry Benchmark:
+speedometer
 This is part of Chrome for Chrome OS performance testing.
 
 Pass local=True to run with local telemetry and no AFE server.
-"""
+'''
 
 def run_benchmark(machine):
     host = hosts.create_host(machine)
-    job.run_test("telemetry_Benchmarks", host=host,
-                 benchmark="speedometer", tag="speedometer",
+    job.run_test('telemetry_Benchmarks', host=host,
+                 benchmark='speedometer',
+                 tag='speedometer',
                  args=utils.args_to_dict(args))
 
-parallel_simple(run_benchmark, machines)
+parallel_simple(run_benchmark, machines)
\ No newline at end of file
diff --git a/server/site_tests/telemetry_Benchmarks/control.startup.cold.blank_page b/server/site_tests/telemetry_Benchmarks/control.startup.cold.blank_page
index baf8518..d089e2a 100644
--- a/server/site_tests/telemetry_Benchmarks/control.startup.cold.blank_page
+++ b/server/site_tests/telemetry_Benchmarks/control.startup.cold.blank_page
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.startup.cold.blank_page'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.sunspider b/server/site_tests/telemetry_Benchmarks/control.sunspider
index 4f56ff8..15bc85a 100644
--- a/server/site_tests/telemetry_Benchmarks/control.sunspider
+++ b/server/site_tests/telemetry_Benchmarks/control.sunspider
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.sunspider'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
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 6e366d9..8474f09 100644
--- a/server/site_tests/telemetry_Benchmarks/control.tab_switching.top_10
+++ b/server/site_tests/telemetry_Benchmarks/control.tab_switching.top_10
@@ -29,4 +29,4 @@
                  tag='tab_switching.top_10',
                  args=utils.args_to_dict(args))
 
-parallel_simple(run_benchmark, machines)
+parallel_simple(run_benchmark, machines)
\ No newline at end of file
diff --git a/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases b/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases
index 6b9d632..cb50999 100644
--- a/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases
@@ -8,7 +8,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.webrtc.webrtc_cases'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py b/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py
index 96f4870..ff1b0e0 100644
--- a/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py
+++ b/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py
@@ -47,7 +47,7 @@
 
 AUTHOR = 'sbasi, achuith, rohitbm'
 NAME = 'telemetry_Benchmarks.{0}'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
 TIME = 'LONG'
 TEST_CATEGORY = 'Benchmark'
 TEST_CLASS = 'performance'