diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index 88d72bf887..e4d56e6c25 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -250,14 +250,7 @@ def log_download(mavproxy, mav, filename, timeout=360):
     mav.wait_heartbeat()
     mav.wait_heartbeat()
     mavproxy.send("log download latest %s\n" % filename)
-    t1 = time.time()
-    while time.time() - t1 < timeout:
-        try:
-            mavproxy.expect("Finished downloading", timeout=5)
-        except Exception:
-            mavproxy.send("log status\n")
-            continue
-        break
+    mavproxy.expect("Finished downloading", timeout=timeout)
     mavproxy.send("log erase\n")
     mav.wait_heartbeat()
     mav.wait_heartbeat()