diff --git a/test_suites/control.PGO_record b/test_suites/control.PGO_record
index 903b967..aee3cc6 100644
--- a/test_suites/control.PGO_record
+++ b/test_suites/control.PGO_record
@@ -50,5 +50,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='PGO_record', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=True, skip_reimage=False, bug_template=_BUG_TEMPLATE,
-    devserver_url=devserver_url)
+    file_bugs=True, priority=priority, timeout=timeout,
+    bug_template=_BUG_TEMPLATE, devserver_url=devserver_url)
diff --git a/test_suites/control.au b/test_suites/control.au
index 30d672a..f282dc4 100644
--- a/test_suites/control.au
+++ b/test_suites/control.au
@@ -42,5 +42,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='au', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=False,
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     max_runtime_mins=60, devserver_url=devserver_url)
diff --git a/test_suites/control.audio b/test_suites/control.audio
index b23ffd0..4cc9ecf 100644
--- a/test_suites/control.audio
+++ b/test_suites/control.audio
@@ -30,5 +30,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='audio', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.browsertests b/test_suites/control.browsertests
index 94b3eb4..26f4f2f 100644
--- a/test_suites/control.browsertests
+++ b/test_suites/control.browsertests
@@ -32,5 +32,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='browsertests', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.bvt b/test_suites/control.bvt
index 236647e..7226135 100644
--- a/test_suites/control.bvt
+++ b/test_suites/control.bvt
@@ -57,5 +57,5 @@
 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, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     max_runtime_mins=20, bug_template=_BUG_TEMPLATE, devserver_url=devserver_url)
diff --git a/test_suites/control.dummy b/test_suites/control.dummy
index 5b4beca..d2b869b 100644
--- a/test_suites/control.dummy
+++ b/test_suites/control.dummy
@@ -23,5 +23,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='dummy', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.dummyflake b/test_suites/control.dummyflake
index 98673c8..7704896 100644
--- a/test_suites/control.dummyflake
+++ b/test_suites/control.dummyflake
@@ -30,5 +30,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='dummyflake', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.enterprise b/test_suites/control.enterprise
index 650c012..b898d83 100644
--- a/test_suites/control.enterprise
+++ b/test_suites/control.enterprise
@@ -30,5 +30,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='enterprise', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.enterprise_enroll b/test_suites/control.enterprise_enroll
index 99de171..e68c0db 100644
--- a/test_suites/control.enterprise_enroll
+++ b/test_suites/control.enterprise_enroll
@@ -27,5 +27,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='enterprise_enroll', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.faft_dev b/test_suites/control.faft_dev
index 7e16234..d1d3450 100644
--- a/test_suites/control.faft_dev
+++ b/test_suites/control.faft_dev
@@ -37,5 +37,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='faft_dev', job=job,
     pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     firmware_reimage=True, devserver_url=devserver_url)
diff --git a/test_suites/control.faft_ec b/test_suites/control.faft_ec
index 9dd9fae..acd8282 100644
--- a/test_suites/control.faft_ec
+++ b/test_suites/control.faft_ec
@@ -48,5 +48,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='faft_ec', job=job,
     pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=True, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=True, priority=priority, timeout=timeout,
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url)
diff --git a/test_suites/control.faft_lab b/test_suites/control.faft_lab
index eac5d58..b78dd5f 100644
--- a/test_suites/control.faft_lab
+++ b/test_suites/control.faft_lab
@@ -41,5 +41,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='faft_lab', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=True, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=True, priority=priority, timeout=timeout,
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url)
diff --git a/test_suites/control.faft_normal b/test_suites/control.faft_normal
index 6bd9c7f..80895c0 100644
--- a/test_suites/control.faft_normal
+++ b/test_suites/control.faft_normal
@@ -50,5 +50,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='faft_normal', job=job,
     pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=True, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=True, priority=priority, timeout=timeout,
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url)
diff --git a/test_suites/control.graphics b/test_suites/control.graphics
index efd9c7f..c6c7f47 100644
--- a/test_suites/control.graphics
+++ b/test_suites/control.graphics
@@ -42,5 +42,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='graphics', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.graphicsGLES b/test_suites/control.graphicsGLES
index 85e84e0..7fee508 100644
--- a/test_suites/control.graphicsGLES
+++ b/test_suites/control.graphicsGLES
@@ -38,5 +38,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='graphicsGLES', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.graphics_per-build b/test_suites/control.graphics_per-build
index 8761249..cb357bd 100644
--- a/test_suites/control.graphics_per-build
+++ b/test_suites/control.graphics_per-build
@@ -37,5 +37,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='graphics_per-build', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.hwqual b/test_suites/control.hwqual
index dd1165d..8970ef5 100644
--- a/test_suites/control.hwqual
+++ b/test_suites/control.hwqual
@@ -27,5 +27,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='hwqual', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.kernel_daily_benchmarks b/test_suites/control.kernel_daily_benchmarks
index 1a438ff..60c0573 100644
--- a/test_suites/control.kernel_daily_benchmarks
+++ b/test_suites/control.kernel_daily_benchmarks
@@ -31,5 +31,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='kernel_daily_benchmarks', job=job,
     pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.kernel_daily_regression b/test_suites/control.kernel_daily_regression
index 40270a7..8ec1a29 100644
--- a/test_suites/control.kernel_daily_regression
+++ b/test_suites/control.kernel_daily_regression
@@ -31,5 +31,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='kernel_daily_regression', job=job,
     pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.kernel_per-build_benchmarks b/test_suites/control.kernel_per-build_benchmarks
index 191713a..d8fb4dc 100644
--- a/test_suites/control.kernel_per-build_benchmarks
+++ b/test_suites/control.kernel_per-build_benchmarks
@@ -34,5 +34,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='kernel_per-build_benchmarks', job=job,
     pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.kernel_per-build_regression b/test_suites/control.kernel_per-build_regression
index 9f41920..f7fdc61 100644
--- a/test_suites/control.kernel_per-build_regression
+++ b/test_suites/control.kernel_per-build_regression
@@ -36,5 +36,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='kernel_per-build_regression', job=job,
     pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.kernel_weekly_regression b/test_suites/control.kernel_weekly_regression
index ce247a5..ae8ccae 100644
--- a/test_suites/control.kernel_weekly_regression
+++ b/test_suites/control.kernel_weekly_regression
@@ -32,5 +32,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='kernel_weekly_regression', job=job,
     pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.link_perf b/test_suites/control.link_perf
index 8805c47..6579811 100644
--- a/test_suites/control.link_perf
+++ b/test_suites/control.link_perf
@@ -18,6 +18,5 @@
 
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='link_perf', job=job, pool=pool, num=num,
-    add_experimental=True, file_bugs=file_bugs,
-    skip_reimage=dynamic_suite.skip_reimage(globals()),
-    devserver_url=devserver_url)
+    add_experimental=True, file_bugs=file_bugs, priority=priority,
+    timeout=timeout, devserver_url=devserver_url)
diff --git a/test_suites/control.network3g b/test_suites/control.network3g
index 716b999..395a408 100644
--- a/test_suites/control.network3g
+++ b/test_suites/control.network3g
@@ -44,5 +44,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='network3g', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url)
diff --git a/test_suites/control.network3g_gobi b/test_suites/control.network3g_gobi
index 6f19e6e..c43dcda 100644
--- a/test_suites/control.network3g_gobi
+++ b/test_suites/control.network3g_gobi
@@ -44,5 +44,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='network3g_gobi', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url)
diff --git a/test_suites/control.network3g_pseudomodem b/test_suites/control.network3g_pseudomodem
index 69fe022..88b7dca 100644
--- a/test_suites/control.network3g_pseudomodem
+++ b/test_suites/control.network3g_pseudomodem
@@ -49,5 +49,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='network3g_pseudomodem', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url)
diff --git a/test_suites/control.network3g_tmobile b/test_suites/control.network3g_tmobile
index 211e28a..7e0165a 100644
--- a/test_suites/control.network3g_tmobile
+++ b/test_suites/control.network3g_tmobile
@@ -44,6 +44,6 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='network3g_tmobile', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     suite_dependencies='carrier:tmobile', bug_template=_BUG_TEMPLATE,
     devserver_url=devserver_url)
diff --git a/test_suites/control.network3g_verizon b/test_suites/control.network3g_verizon
index 51212a6..8a33541 100644
--- a/test_suites/control.network3g_verizon
+++ b/test_suites/control.network3g_verizon
@@ -44,6 +44,6 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='network3g_verizon', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     suite_dependencies='carrier:verizon', bug_template=_BUG_TEMPLATE,
     devserver_url=devserver_url)
diff --git a/test_suites/control.network_nightly b/test_suites/control.network_nightly
index 39676ec..cdc0ffa 100644
--- a/test_suites/control.network_nightly
+++ b/test_suites/control.network_nightly
@@ -33,5 +33,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name=NAME, job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     max_runtime_mins=20, devserver_url=devserver_url)
diff --git a/test_suites/control.network_wifi b/test_suites/control.network_wifi
index 6f776fe..45690d1 100644
--- a/test_suites/control.network_wifi
+++ b/test_suites/control.network_wifi
@@ -32,5 +32,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='network_wifi', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.onccell b/test_suites/control.onccell
index 53cf65c..afa3651 100644
--- a/test_suites/control.onccell
+++ b/test_suites/control.onccell
@@ -27,5 +27,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='onccell', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.pagecycler b/test_suites/control.pagecycler
index ffd96b0..6563e3f 100644
--- a/test_suites/control.pagecycler
+++ b/test_suites/control.pagecycler
@@ -30,5 +30,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='pagecycler', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.perf_v2 b/test_suites/control.perf_v2
index d4dd934..29cf457 100644
--- a/test_suites/control.perf_v2
+++ b/test_suites/control.perf_v2
@@ -44,5 +44,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='perf_v2', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=False, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=False, priority=priority, timeout=timeout,
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url)
diff --git a/test_suites/control.perfalerts b/test_suites/control.perfalerts
index f889f9c..7b00d0b 100644
--- a/test_suites/control.perfalerts
+++ b/test_suites/control.perfalerts
@@ -32,5 +32,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='perfalerts', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.power_build b/test_suites/control.power_build
index 05aae67..dbad95b 100644
--- a/test_suites/control.power_build
+++ b/test_suites/control.power_build
@@ -27,5 +27,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='power_build', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.power_daily b/test_suites/control.power_daily
index 4db6d06..5b95227 100644
--- a/test_suites/control.power_daily
+++ b/test_suites/control.power_daily
@@ -27,5 +27,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='power_daily', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.power_requirements b/test_suites/control.power_requirements
index 8dd7efc..22825d0 100644
--- a/test_suites/control.power_requirements
+++ b/test_suites/control.power_requirements
@@ -28,5 +28,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='power_requirements', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.pyauto b/test_suites/control.pyauto
index 185a8ad..644ddde 100644
--- a/test_suites/control.pyauto
+++ b/test_suites/control.pyauto
@@ -30,5 +30,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='pyauto', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.pyauto_basic b/test_suites/control.pyauto_basic
index c957388..4ca5574 100644
--- a/test_suites/control.pyauto_basic
+++ b/test_suites/control.pyauto_basic
@@ -30,5 +30,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='pyauto_basic', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.pyauto_perf b/test_suites/control.pyauto_perf
index 1cd1a14..baf01ff 100644
--- a/test_suites/control.pyauto_perf
+++ b/test_suites/control.pyauto_perf
@@ -30,5 +30,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='pyauto_perf', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.regression b/test_suites/control.regression
index 282b300..d646385 100644
--- a/test_suites/control.regression
+++ b/test_suites/control.regression
@@ -31,5 +31,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='regression', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.security b/test_suites/control.security
index c4860e7..a15a2dd 100755
--- a/test_suites/control.security
+++ b/test_suites/control.security
@@ -33,5 +33,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='security', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.servo b/test_suites/control.servo
index fbf2c7c..a56c9cd 100644
--- a/test_suites/control.servo
+++ b/test_suites/control.servo
@@ -22,6 +22,5 @@
 
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='servo', job=job, pool=pool, num=num,
-    add_experimental=True, file_bugs=file_bugs,
-    skip_reimage=dynamic_suite.skip_reimage(globals()),
-    devserver_url=devserver_url)
+    add_experimental=True, file_bugs=file_bugs, priority=priority,
+    timeout=timeout, devserver_url=devserver_url)
diff --git a/test_suites/control.smoke b/test_suites/control.smoke
index f94302a..3155ba6 100644
--- a/test_suites/control.smoke
+++ b/test_suites/control.smoke
@@ -31,5 +31,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='smoke', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.stumpycelltrial b/test_suites/control.stumpycelltrial
index d59f6da..7dd1bef 100644
--- a/test_suites/control.stumpycelltrial
+++ b/test_suites/control.stumpycelltrial
@@ -33,5 +33,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name=NAME, job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     max_runtime_mins=60, devserver_url=devserver_url)
diff --git a/test_suites/control.sync b/test_suites/control.sync
index 8fae350..9f8f469 100644
--- a/test_suites/control.sync
+++ b/test_suites/control.sync
@@ -30,5 +30,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='sync', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.vda b/test_suites/control.vda
index 48dddac..8e16971 100644
--- a/test_suites/control.vda
+++ b/test_suites/control.vda
@@ -34,5 +34,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='vda', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.video b/test_suites/control.video
index bfebbf2..8f69a3a 100644
--- a/test_suites/control.video
+++ b/test_suites/control.video
@@ -30,5 +30,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='video', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.video_weekly_regression b/test_suites/control.video_weekly_regression
index eeac0c9..2dd61ed 100644
--- a/test_suites/control.video_weekly_regression
+++ b/test_suites/control.video_weekly_regression
@@ -32,5 +32,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='video_weekly_regression', job=job,
     pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.webrtc b/test_suites/control.webrtc
index c509c28..101818a 100644
--- a/test_suites/control.webrtc
+++ b/test_suites/control.webrtc
@@ -41,5 +41,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='webrtc', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=True, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=True, priority=priority, timeout=timeout,
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url)
diff --git a/test_suites/control.wifi_matfunc b/test_suites/control.wifi_matfunc
index e7f9e84..941325f 100644
--- a/test_suites/control.wifi_matfunc
+++ b/test_suites/control.wifi_matfunc
@@ -32,5 +32,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name=NAME, job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     max_runtime_mins=60, devserver_url=devserver_url)
diff --git a/test_suites/control.wificell b/test_suites/control.wificell
index 5e5f217..690c95f 100644
--- a/test_suites/control.wificell
+++ b/test_suites/control.wificell
@@ -27,5 +27,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='wificell', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=dynamic_suite.skip_reimage(globals()),
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
     devserver_url=devserver_url)
diff --git a/test_suites/control.wifichaos b/test_suites/control.wifichaos
index 3bd01c2..b83cc17 100644
--- a/test_suites/control.wifichaos
+++ b/test_suites/control.wifichaos
@@ -26,5 +26,5 @@
 
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='wifichaos', job=job, pool=pool,
-    check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, devserver_url=devserver_url)
+    check_hosts=check_hosts, add_experimental=True, num=num, priority=priority,
+    timeout=timeout, file_bugs=file_bugs, devserver_url=devserver_url)
diff --git a/test_suites/control.wifirvr b/test_suites/control.wifirvr
index 729b222..1244d73 100644
--- a/test_suites/control.wifirvr
+++ b/test_suites/control.wifirvr
@@ -26,4 +26,5 @@
 dynamic_suite.reimage_and_run(
     build=build, board=board, name='wifirvr', job=job, pool=pool,
     check_hosts=check_hosts, add_experimental=True, num=num,
-    file_bugs=file_bugs, skip_reimage=True, devserver_url=devserver_url)
+    file_bugs=file_bugs, priority=priority, timeout=timeout,
+    devserver_url=devserver_url)