diff --git a/test_suites/control.bvt b/test_suites/control.bvt
index 38ac01a..d0529ee 100755
--- a/test_suites/control.bvt
+++ b/test_suites/control.bvt
@@ -18,8 +18,8 @@
 crash reporting, get updates, and allow a user to log in, among other things.
 
 @param build: The name of the image to test.
-              Ex: x86-mario-r17/R17-1412.33.0-a1-b29
-@param board: The board to test on.  Ex: netbook_MARIO_MP
+              Ex: x86-mario-release/R17-1412.33.0-a1-b29
+@param board: The board to test on.  Ex: x86-mario
 @param pool: The pool of machines to utilize for scheduling. If pool=None
              board is used.
 @param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
@@ -33,6 +33,5 @@
 
 if (reimager.skip(globals()) or
     reimager.attempt(build, board, job.record)):
-    bvt = dynamic_suite.Suite.create_from_name(suite_tag, job.autodir,
-                                               pool=pool)
-    bvt.run_and_wait(build, job.record, add_experimental=True)
+    bvt = dynamic_suite.Suite.create_from_name(suite_tag, build, pool=pool)
+    bvt.run_and_wait(job.record, add_experimental=True)