diff --git a/test/hello.py b/test/hello.py
index 956a43b8f8..ef647e41f4 100644
--- a/test/hello.py
+++ b/test/hello.py
@@ -6,10 +6,10 @@
 #
 
 def test(helper):
-      helper.wait_output("--- Chrome EC initialized")
+      helper.wait_output("--- UART initialized")
       helper.ec_command("version")
-      ro = helper.wait_output("RO version:\s*(?P<ro>\S+)", use_re=True)["ro"]
-      wa = helper.wait_output("RW-A version:\s*(?P<a>\S+)", use_re=True)["a"]
-      wb = helper.wait_output("RW-B version:\s*(?P<b>\S*)", use_re=True)["b"]
+      ro = helper.wait_output("RO:\s*(?P<ro>\S+)", use_re=True)["ro"]
+      wa = helper.wait_output("RW-A:\s*(?P<a>\S+)", use_re=True)["a"]
+      wb = helper.wait_output("RW-B:\s*(?P<b>\S*)", use_re=True)["b"]
       helper.trace("Version (RO/A/B) %s / %s / %s\n" % (ro, wa, wb))
       return True # PASS !
diff --git a/test/timer_calib.py b/test/timer_calib.py
index 1d873334ed..8d2f328734 100644
--- a/test/timer_calib.py
+++ b/test/timer_calib.py
@@ -39,7 +39,7 @@ def test(helper):
       one_pass(helper)
 
       helper.ec_command("reboot")
-      helper.wait_output("--- Chrome EC initialized")
+      helper.wait_output("--- UART initialized")
 
       # get the timing results on the second pass
       # to avoid binary translation overhead
diff --git a/util/qemu-system-arm b/util/qemu-system-arm
index fe38b6fc25..e84e498e8d 100755
Binary files a/util/qemu-system-arm and b/util/qemu-system-arm differ