diff --git a/testrunner/adb_interface.py b/testrunner/adb_interface.py
index 3bd4396f4..feb1c893b 100755
--- a/testrunner/adb_interface.py
+++ b/testrunner/adb_interface.py
@@ -155,6 +155,7 @@ class AdbInterface:
       return True
     elif "restarting adbd as root" in output:
       # device will disappear from adb, wait for it to come back
+      time.sleep(2)
       self.SendCommand("wait-for-device")
       return True
     else:
diff --git a/testrunner/runtest.py b/testrunner/runtest.py
index 3ecc77b22..d80bfe6d0 100755
--- a/testrunner/runtest.py
+++ b/testrunner/runtest.py
@@ -35,6 +35,7 @@ import optparse
 import os
 from sets import Set
 import sys
+import time
 
 # local imports
 import adb_interface
@@ -388,6 +389,8 @@ class TestRunner(object):
           self._adb.SendShellCommand("\"echo %s >> /data/local.prop\""
                                      % self._DALVIK_VERIFIER_OFF_PROP)
           self._adb.SendCommand("reboot")
+          # wait for device to go offline
+          time.sleep(10)
           self._adb.SendCommand("wait-for-device", timeout_time=60,
                                 retry_count=3)
           self._adb.EnableAdbRoot()