diff --git a/test/scripts/valgrind.sh b/test/scripts/valgrind.sh
index 7c23c79..39cda0d 100644
--- a/test/scripts/valgrind.sh
+++ b/test/scripts/valgrind.sh
@@ -8,7 +8,10 @@
 VALGRIND_CMDLINE="valgrind --leak-check=full --show-reachable=yes --track-origins=yes -q"
 
 if [ $VALGRIND -eq 1 ]; then
+    test_runner="$VALGRIND_CMDLINE"
     json_process="$VALGRIND_CMDLINE $json_process"
+else
+    test_runner=""
 fi
 
 valgrind_check() {
diff --git a/test/suites/api/run b/test/suites/api/run
index fbee1da..02e92b0 100755
--- a/test/suites/api/run
+++ b/test/suites/api/run
@@ -15,7 +15,10 @@ run_test() {
     if [ -x $test_path ]; then
         test_log=$test_log $test_path >$test_log/stdout 2>$test_log/stderr
     else
-        $suite_builddir/${test_name%.c} >$test_log/stdout 2>$test_log/stderr
+        $test_runner $suite_builddir/${test_name%.c} \
+            >$test_log/stdout \
+            2>$test_log/stderr
+        valgrind_check $test_log/stderr || return 1
     fi
 }