diff --git a/.travis.yml b/.travis.yml
index 041134a..90e0553 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ script:
  - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage -DBoost_USE_STATIC_LIBS=OFF  -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON .
  - 'which build-wrapper-linux-x86-64 && build-wrapper-linux-x86-64 --out-dir bw-output make -j 2 || make -j 2'
  - set -o pipefail
+ - tests/all_tests --list_content
  - tests/run-parallel-tests.sh tests/all_tests
  - tests/api 2>&1 | cat
  - tests/bip_lock 2>&1 | cat
diff --git a/tests/run-parallel-tests.sh b/tests/run-parallel-tests.sh
index d7a6986..dff4d2e 100755
--- a/tests/run-parallel-tests.sh
+++ b/tests/run-parallel-tests.sh
@@ -1,17 +1,19 @@
 #!/bin/sh
 
-if [ "$#" != 1 ]; then
-    echo "Usage: $0 <boost-unit-test-executable>" 1>&2
+if [ "$#" -lt 1 -o "$1" = '--help' -o "$1" = '-h' ]; then
+    echo "Usage: $0 <boost-unit-test-executable> [...]" 1>&2
     exit 1
 fi
 
-"$1" --list_content 2>&1 \
-  | grep '\*$' \
-  | sed 's=\*$==;s=^    =/=' \
-  | while read t; do
-	case "$t" in
-	/*) echo "$pre$t"; ;;
-	*) pre="$t"; ;;
-	esac
-    done \
-  | parallel -v --group --eta -- "$1" -t {}
+for i in "$@"; do
+  "$i" --list_content 2>&1 \
+    | grep '\*$' \
+    | sed 's=\*$==;s=^    =/=' \
+    | while read t; do
+	  case "$t" in
+	  /*) echo $i; echo "$pre$t"; ;;
+	  *) pre="$t"; ;;
+	  esac
+      done
+done \
+  | parallel -v --group --eta -N 2 -- {1} -t {2}