diff --git a/build_autotest.sh b/build_autotest.sh
index b85be15373..d974e4d31e 100755
--- a/build_autotest.sh
+++ b/build_autotest.sh
@@ -25,9 +25,7 @@ if [[ -n "${CROS_WORKON_SRCROOT}" ]]; then
     setup_board_warning
     exit 1
   fi
-  $(dirname "$0")/cros_workon --board=${FLAGS_board} start \
-      autotest autotest-tests autotest-deps
-  emerge-${FLAGS_board} autotest-tests
+  emerge-${FLAGS_board} autotest-all
 else
   ./autotest --noprompt --build=all --board="${FLAGS_board}" $@
 fi
diff --git a/cros_mark_as_stable_blacklist b/cros_mark_as_stable_blacklist
index f793c7e6d8..e69de29bb2 100644
--- a/cros_mark_as_stable_blacklist
+++ b/cros_mark_as_stable_blacklist
@@ -1,2 +0,0 @@
-chromeos-base/autotest-tests
-chromeos-base/autotest