diff --git a/autotest-js.sh b/autotest-js.sh
index 8b9a106b02..a3a5f65fd2 100755
--- a/autotest-js.sh
+++ b/autotest-js.sh
@@ -7,6 +7,9 @@
 # @author Vincent Petry
 # @copyright 2014 Vincent Petry <pvince81@owncloud.com>
 #
+
+set -e
+
 NPM="$(which npm 2>/dev/null)"
 PREFIX="build"
 
diff --git a/autotest.sh b/autotest.sh
index d359aed91e..eb6b488818 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -6,6 +6,8 @@
 # @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu
 #
 
+set -e
+
 #$EXECUTOR_NUMBER is set by Jenkins and allows us to run autotest in parallel
 DATABASENAME=oc_autotest$EXECUTOR_NUMBER
 DATABASEUSER=oc_autotest$EXECUTOR_NUMBER