diff --git a/testing/scripts/travis-job b/testing/scripts/travis-job
index bb6ef760d6..f006b898ce 100644
--- a/testing/scripts/travis-job
+++ b/testing/scripts/travis-job
@@ -158,8 +158,7 @@ run() {
     echo
     echo "Running external tests ##############################################"
     echo
-    trap showdiag EXIT
-    make
+    make || showdiag
 
     # If we get here, then external tests were successful.
     exit $ret
@@ -175,6 +174,8 @@ showdiag() {
       echo "Output of failed external tests #####################################" && \
       echo && \
       grep -v "... not available, skipped" $f
+
+    exit 1
 }
 
 if [ "$step" != "install" ] && [ "$step" != "build" ] && [ "$step" != "run" ]; then