diff --git a/test/run-test b/test/run-test
index 8f0d85b..8d7198f 100755
--- a/test/run-test
+++ b/test/run-test
@@ -50,7 +50,7 @@
 build_output="build-output.txt"
 run_args="--quiet"
 
-host_mode="no"
+target_mode="yes"
 dev_mode="no"
 update_mode="no"
 debug_mode="no"
@@ -58,12 +58,13 @@
 
 while true; do
     if [ "x$1" = "x--host" ]; then
-        host_mode="yes"
+        target_mode="no"
         RUN="${progdir}/etc/host-run-test-jar"
         IMAGE=${ANDROID_HOST_OUT}/framework/core.art
         DEX_LOCATION=$tmp_dir
         shift
     elif [ "x$1" = "x--jvm" ]; then
+        target_mode="no"
         RUN="${progdir}/etc/reference-run-test-classes"
         NEED_DEX="false"
         shift
@@ -240,7 +241,7 @@
 if [ "$good" = "yes" ]; then
     cd "$oldwd"
     rm -rf "$tmp_dir"
-    if [ "$host_mode" = "no" ]; then
+    if [ "$target_mode" = "yes" ]; then
         adb shell rm -r $DEX_LOCATION
     fi
     exit 0
@@ -258,7 +259,7 @@
         echo ' '
     fi
     echo "${TEST_NAME} files left in ${tmp_dir} on host"
-    if [ "$host_mode" = "no" ]; then
+    if [ "$target_mode" = "yes" ]; then
         echo "and in ${DEX_LOCATION} on target"
     fi