diff --git a/mod_for_test_scripts/350addTestAuthKeys b/mod_for_test_scripts/350addTestAuthKeys
index cc3967db22..07da2e26cb 100755
--- a/mod_for_test_scripts/350addTestAuthKeys
+++ b/mod_for_test_scripts/350addTestAuthKeys
@@ -7,10 +7,14 @@
 # Copy public keys to root's homedir for ssh pubkey auth, which
 # is necessary for test automation.
 
-echo "Copying public keys"
+echo "Copying public keys and changing PATH for ssh clients"
 
 KEYS_DIR=${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts/ssh_keys
 mkdir -p ${ROOT_FS_DIR}/root/.ssh
 ROOT_AUTHKEYS=${ROOT_FS_DIR}/root/.ssh/authorized_keys
 cat ${KEYS_DIR}/*.pub >> ${ROOT_AUTHKEYS}
 
+# Environment on test machines for su and ssh now set to include
+touch ${ROOT_FS_DIR}/etc/environment
+echo "PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" \
+  >> "${ROOT_FS_DIR}/etc/environment"