diff --git a/sync_build_test.sh b/sync_build_test.sh
index 99f19a5efb..ccb151470b 100755
--- a/sync_build_test.sh
+++ b/sync_build_test.sh
@@ -533,11 +533,6 @@ function main() {
         ./build_packages "${board_param}" \
         ${jobs_param} ${withdev_param} ${build_autotest_param} \
         ${pkg_param}
-
-    if [[ "${FLAGS_board}" == "x86-generic" ]]; then
-      run_phase_in_chroot "Running unit tests" ./cros_run_unit_tests \
-        ${board_param}
-    fi
   fi
 
   if [[ ${FLAGS_chrome_root} ]]; then
@@ -546,6 +541,12 @@ function main() {
       CHROME_ORIGIN=LOCAL_SOURCE emerge-${FLAGS_board} chromeos-chrome
   fi
 
+  if [[ ${FLAGS_unittest} -eq ${FLAGS_TRUE} ]] && [[ "${FLAGS_board}" == \
+    "x86-generic" ]] ; then
+    run_phase_in_chroot "Running unit tests" ./cros_run_unit_tests \
+      ${board_param}
+  fi
+
   if [[ ${FLAGS_master} -eq ${FLAGS_TRUE} ]]; then
     chdir_relative src/scripts
     if [[ -n "${FLAGS_chronos_passwd}" ]]; then