diff --git a/cmds/monkey/src/com/android/commands/monkey/Monkey.java b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
index 2f14a26a7..18cf19de9 100644
--- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java
+++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
@@ -452,9 +452,6 @@ public class Monkey {
      * @param args The command-line arguments
      */
     public static void main(String[] args) {
-        // Set ro.monkey if it's not set yet.
-        SystemProperties.set("ro.monkey", "true");
-
         // Set the process name showing in "ps" or "top"
         Process.setArgV0("com.android.commands.monkey");
 
@@ -551,13 +548,13 @@ public class Monkey {
             mCountEvents = false;
         } else if (mScriptFileNames != null && mScriptFileNames.size() > 1) {
             if (mSetupFileName != null) {
-                mEventSource = new MonkeySourceRandomScript(mSetupFileName, 
+                mEventSource = new MonkeySourceRandomScript(mSetupFileName,
                         mScriptFileNames, mThrottle, mRandomizeThrottle, mRandom,
                         mProfileWaitTime, mDeviceSleepTime, mRandomizeScript);
                 mCount++;
             } else {
                 mEventSource = new MonkeySourceRandomScript(mScriptFileNames,
-                        mThrottle, mRandomizeThrottle, mRandom, 
+                        mThrottle, mRandomizeThrottle, mRandom,
                         mProfileWaitTime, mDeviceSleepTime, mRandomizeScript);
             }
             mEventSource.setVerbose(mVerbose);
diff --git a/testrunner/adb_interface.py b/testrunner/adb_interface.py
index 1928c73a8..3bd4396f4 100755
--- a/testrunner/adb_interface.py
+++ b/testrunner/adb_interface.py
@@ -465,7 +465,7 @@ class AdbInterface:
     output = ""
     error = None
     if runtime_restart:
-      self.SendShellCommand("setprop ro.monkey 1", retry_count=retry_count)
+      self.SendShellCommand("setprop ro.test_harness 1", retry_count=retry_count)
       # manual rest bootcomplete flag
       self.SendShellCommand("setprop dev.bootcomplete 0",
                             retry_count=retry_count)
diff --git a/tools/labpretest/labpretest.sh b/tools/labpretest/labpretest.sh
index 62238f037..5db79602f 100755
--- a/tools/labpretest/labpretest.sh
+++ b/tools/labpretest/labpretest.sh
@@ -531,8 +531,8 @@ for ((loop=1 ; loop <= $COUNT ; loop++ )) ; do
   #preping device for monkey run
   log_print "setting adb root"
   adb_command root
-  log_print "setting ro.monkey property"
-  adb_command shell setprop ro.monkey 1
+  log_print "setting ro.test_harness property"
+  adb_command shell setprop ro.test_harness 1
 
   log_print "waiting for device to finish booting"
   result=$($ADB -s $device shell getprop dev.bootcomplete)