diff --git a/build_autotest.sh b/build_autotest.sh
index 78d7dc6fe0..e3ce752af3 100755
--- a/build_autotest.sh
+++ b/build_autotest.sh
@@ -25,8 +25,10 @@ if [[ -n "${CROS_WORKON_SRCROOT}" ]]; then
     setup_board_warning
     exit 1
   fi
+  $(dirname "$0")/cros_workon --board=${FLAGS_board} start \
+      autotest autotest-tests
   emerge-${FLAGS_board} autotest-tests
 else
-  ./autotest --noprompt --build=all --board="${DEFAULT_BOARD}" $@
+  ./autotest --noprompt --build=all --board="${FLAGS_board}" $@
 fi