diff --git a/tools/run-test-valgrind.sh b/tools/run-test-valgrind.sh
index 0cdada7b6b..cd53306b4c 100755
--- a/tools/run-test-valgrind.sh
+++ b/tools/run-test-valgrind.sh
@@ -50,6 +50,9 @@ if [ $RESULT -ne 0 -a $RESULT -ne 77 ]; then
 			echo Files without debugging symbols: $UNRESOLVED >&2
 		fi
 	fi
+	exit $RESULT
 fi
 
+find -name "$LOGFILE" -size 0 -delete
+
 exit $RESULT