diff --git a/tests/lib.sh b/tests/lib.sh
index 53a2ea4..3e29a55 100644
--- a/tests/lib.sh
+++ b/tests/lib.sh
@@ -74,7 +74,7 @@ run_test() {
             export COLORED_STDERR_FORCE_WRITE
         fi
 
-        "$@" "$testcase" > output 2>&1
+        $valgrind_cmd "$@" "$testcase" > output 2>&1
     )
 
     diff -u "$expected" output \
diff --git a/tests/run.sh b/tests/run.sh
index abd0e28..186b24b 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -25,6 +25,13 @@ test "x$srcdir" = x && srcdir=.
 . "$srcdir/lib.sh"
 
 
+# Use valgrind to run the tests if it's available.
+valgrind_cmd=
+if type valgrind >/dev/null 2>&1; then
+    valgrind_cmd='valgrind --quiet --error-exitcode=1'
+fi
+
+
 # Make sure we don't write to non-ttys by default.
 force_write=
 test_script example-noforce.sh