diff --git a/s/runtests b/s/runtests
index 82c49251e..17df4e165 100755
--- a/s/runtests
+++ b/s/runtests
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+set -e
+
 ROOT=$(pwd)
 while [ ! -d $ROOT/.git ]; do
   ROOT=$(dirname $ROOT)
@@ -15,11 +18,11 @@ if [ ! -d $ROOT/$BIN_DIR ]; then
   exit
 fi
 
-$ROOT/$BIN_DIR/eressea/test_eressea || exit $?
+$ROOT/$BIN_DIR/eressea/test_eressea
 cd $ROOT
 [ -e eressea.ini ] || ln -sf conf/eressea.ini
-$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests.lua || exit $?
-$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests-e2.lua || exit $?
-$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests-e3.lua || exit $?
+$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests.lua
+$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests-e2.lua
+$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests-e3.lua
 
 cd $OLDWPD
diff --git a/s/travis-build b/s/travis-build
index 51a501c15..d1ab6b853 100755
--- a/s/travis-build
+++ b/s/travis-build
@@ -47,6 +47,8 @@ $BUILD/eressea/eressea -v0 scripts/run-tests-e3.lua
 # information
 echo "* base directory: $ROOT"
 echo "* build directory: $BUILD"
+echo "* lsb_release:"
+lsb_release -a
 echo "* zlib1g-dev package:"
 dpkg -l zlib1g-dev
 echo