diff --git a/run_remote_tests.sh b/run_remote_tests.sh
index f9664c0..08757cc 100755
--- a/run_remote_tests.sh
+++ b/run_remote_tests.sh
@@ -174,7 +174,12 @@
 
 autodetect_build() {
   if [ ${FLAGS_use_emerged} -eq ${FLAGS_TRUE} ]; then
-    AUTOTEST_DIR="/build/${FLAGS_board}/usr/local/autotest"
+    if [ -d "/build/${FLAGS_board}/usr/local/autotest/site_utils" ]; then
+      AUTOTEST_DIR="/build/${FLAGS_board}/usr/local/autotest"
+    else
+      AUTOTEST_DIR="/build/${FLAGS_board}/usr/local/build/autotest"
+    fi
+
     FLAGS_build=${FLAGS_FALSE}
     if [ ! -d "${AUTOTEST_DIR}" ]; then
       die \
@@ -212,7 +217,7 @@
     fi
     info "Build and run autotests from ${AUTOTEST_DIR}."
   else
-    AUTOTEST_DIR="/build/${FLAGS_board}/usr/local/autotest"
+    AUTOTEST_DIR="/build/${FLAGS_board}/usr/local/build/autotest"
     if [ ! -d "${AUTOTEST_DIR}" ]; then
       die \
 "Autotest was not emerged, ${AUTOTEST_DIR} does not exist. You should \