diff --git a/testrunner/runtest.py b/testrunner/runtest.py
index a4d723128..a3135db6e 100755
--- a/testrunner/runtest.py
+++ b/testrunner/runtest.py
@@ -320,7 +320,10 @@ class TestRunner(object):
         self._DoBuild()
 
       for test_suite in self._GetTestsToRun():
-        test_suite.Run(self._options, self._adb)
+        try:
+          test_suite.Run(self._options, self._adb)
+        except errors.WaitForResponseTimedOutError:
+          logger.Log("Timed out waiting for response")
 
     except KeyboardInterrupt:
       logger.Log("Exiting...")