diff --git a/tests/_runner.lua b/tests/_runner.lua
index c07490fe9..2a58d37e3 100644
--- a/tests/_runner.lua
+++ b/tests/_runner.lua
@@ -79,6 +79,9 @@ runner.run_steps = function(steps)
     for _,c in ipairs(client.get()) do
       c:kill()
     end
+    if success and result then
+        io.stderr:write("Test finished successfully\n")
+    end
     awesome.quit()
   end) end)
   t:start()
diff --git a/tests/run.sh b/tests/run.sh
index a31bccedb..02be445d9 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -169,9 +169,10 @@ for f in $tests; do
     # Tail the log and quit, when awesome quits.
     tail -n 100000 -f --pid $awesome_pid $awesome_log
 
-    if grep -q -E '^Error|assertion failed' $awesome_log; then
+    if ! grep -q -E '^Test finished successfully$' $awesome_log ||
+            grep -q -E '[Ee]rror|assertion failed' $awesome_log; then
         echo "===> ERROR running $f! <==="
-        grep --color -o --binary-files=text -E '^Error.*|.*assertion failed.*' $awesome_log
+        grep --color -o --binary-files=text -E '.*[Ee]rror.*|.*assertion failed.*' $awesome_log
         errors=$(expr $errors + 1)
     fi
 done