diff --git a/build_autotest.sh b/build_autotest.sh
index 2c0472b9b4..f1ff9e2ede 100755
--- a/build_autotest.sh
+++ b/build_autotest.sh
@@ -21,7 +21,8 @@ DEFAULT_TESTS_LIST="all"
 
 DEFINE_string build "${DEFAULT_TESTS_LIST}" \
   "a comma seperated list of autotest client tests to be prebuilt." b
-DEFINE_boolean prompt $FLAGS_TRUE "Prompt user when building all tests"
+DEFINE_boolean prompt $FLAGS_TRUE "Prompt user when building all tests."
+DEFINE_boolean autox $FLAGS_TRUE "Build autox along with autotest"
 
 # More useful help
 FLAGS_HELP="usage: $0 [flags]"
@@ -64,5 +65,12 @@ else
   TEST_LIST=${FLAGS_build}
 fi
 
+# Decide whether or not to build autox and set use flag
+if [ $FLAGS_autox -eq "$FLAGS_TRUE" ] ; then
+  USE=
+else
+  USE=-autox
+fi 
+
 GCLIENT_ROOT="${GCLIENT_ROOT}" TEST_LIST=${TEST_LIST} \
-"emerge-${FLAGS_board}" chromeos-base/autotest
+  USE="$USE" "emerge-${FLAGS_board}" chromeos-base/autotest
\ No newline at end of file
diff --git a/mod_for_test_scripts/350addTestAuthKeys b/mod_for_test_scripts/350addTestAuthKeys
index 52df15e142..13e30d122b 100755
--- a/mod_for_test_scripts/350addTestAuthKeys
+++ b/mod_for_test_scripts/350addTestAuthKeys
@@ -7,6 +7,8 @@
 # Copy public keys to root's homedir for ssh pubkey auth, which
 # is necessary for test automation.
 
+echo "Copying public keys"
+
 KEYS_DIR=ssh_keys
 ROOT_AUTHKEYS=/root/.ssh/authorized_keys
 
diff --git a/mod_for_test_scripts/601autoStartSshd b/mod_for_test_scripts/601autoStartSshd
index 634b866654..fead7fbc16 100755
--- a/mod_for_test_scripts/601autoStartSshd
+++ b/mod_for_test_scripts/601autoStartSshd
@@ -5,7 +5,7 @@
 # found in the LICENSE file.
 
 # start sshd at os init time.
-
+echo "Enabling sshd."
 cp -pf sshd.conf /etc/init/sshd.conf
 chmod 644 /etc/init/sshd.conf
 chown 0:0 /etc/init/sshd.conf
diff --git a/mod_for_test_scripts/700enableAutoxLogin b/mod_for_test_scripts/700enableAutoxLogin
new file mode 100755
index 0000000000..7a2380ce3e
--- /dev/null
+++ b/mod_for_test_scripts/700enableAutoxLogin
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# enable autox login by disabling remembering of last username
+echo "Enabling autologin using autox."
+touch "/root/.forget_usernames"
\ No newline at end of file