diff --git a/test/run-suites b/test/run-suites
index 6e5baf6..ea35424 100755
--- a/test/run-suites
+++ b/test/run-suites
@@ -20,6 +20,8 @@ if [ -z "$SUITES" ]; then
     done
 fi
 
+[ -z "$STOP" ] && STOP=0
+
 export suites_srcdir=$top_srcdir/test/suites
 export suites_builddir=suites
 export scriptdir=$top_srcdir/test/scripts
@@ -34,6 +36,7 @@ for suite in $SUITES; do
         passed=$(($passed+1))
     else
         failed=$(($failed+1))
+        [ $STOP -eq 1 ] && break
     fi
 done
 
diff --git a/test/scripts/run-tests.sh b/test/scripts/run-tests.sh
index 4a039e1..48dfae8 100644
--- a/test/scripts/run-tests.sh
+++ b/test/scripts/run-tests.sh
@@ -12,6 +12,7 @@ suite_log=$logdir/$suite_name
 
 
 [ -z "$VERBOSE" ] && VERBOSE=0
+[ -z "$STOP" ] && STOP=0
 
 . $scriptdir/valgrind.sh
 
@@ -47,6 +48,8 @@ for test_path in $suite_srcdir/*; do
         else
             echo -n "F"
         fi
+
+        [ $STOP -eq 1 ] && break
     fi
 done