diff --git a/travis/install_linux.sh b/travis/install_linux.sh
index f22305b09..df87868c0 100755
--- a/travis/install_linux.sh
+++ b/travis/install_linux.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -x
 
-set -e
+set -ev
 
 sudo apt-get install -qq -y docker
diff --git a/travis/install_osx.sh b/travis/install_osx.sh
index 2125d65cc..4cec67af7 100755
--- a/travis/install_osx.sh
+++ b/travis/install_osx.sh
@@ -2,14 +2,15 @@
 # Script installing dependencies
 # Inspired by https://github.com/google/fruit
 
+set -ev
+
+# Helper for travis folding
 travis_fold() {
   local action=$1
   local name=$2
   echo -en "travis_fold:${action}:${name}\r"
 }
 
-set -e
-
 # Helper for installing packages via homebrew
 install_brew_package() {
   if brew list -1 | grep -q "^$1\$"; then
diff --git a/travis/postsubmit-helper.sh b/travis/postsubmit-helper.sh
index a6a138001..70c56f0e9 100755
--- a/travis/postsubmit-helper.sh
+++ b/travis/postsubmit-helper.sh
@@ -1,7 +1,14 @@
 #!/bin/bash -x
 # Inspired by https://github.com/google/fruit
 
-set -e
+set -ev
+
+# Helper for travis folding
+travis_fold() {
+  local action=$1
+  local name=$2
+  echo -en "travis_fold:${action}:${name}\r"
+}
 
 # This only exists in OS X, but it doesn't cause issues in Linux (the dir doesn't exist, so it's
 # ignored).
@@ -82,20 +89,6 @@ clang-default)
     exit 1
 esac
 
-travis_fold() {
-  local action=$1
-  local name=$2
-  echo -en "travis_fold:${action}:${name}\r"
-}
-
-run_make() {
-  travis_fold start make
-  #make storm -j$N_JOBS
-  #make resources -j$N_JOBS
-  make -j$N_JOBS
-  travis_fold end make
-}
-
 # Build
 echo CXX version: $($CXX --version)
 echo C++ Standard library location: $(echo '#include <vector>' | $CXX -x c++ -E - | grep 'vector\"' | awk '{print $3}' | sed 's@/vector@@;s@\"@@g' | head -n 1)
@@ -125,4 +118,9 @@ then
 fi
 echo
 travis_fold end cmake
-run_make
+
+travis_fold start make
+#make storm -j$N_JOBS
+#make resources -j$N_JOBS
+make -j$N_JOBS
+travis_fold end make
diff --git a/travis/postsubmit.sh b/travis/postsubmit.sh
index dc3ab9ce8..5f665f8a3 100755
--- a/travis/postsubmit.sh
+++ b/travis/postsubmit.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/bash -x
 # Inspired by https://github.com/google/fruit
 
-set -e
+set -ev
 
 : ${N_JOBS:=2}
 : ${TIMEOUT:=400}