diff --git a/.travis.yml b/.travis.yml
index 58dd6fa7ae304e64efb80e794614308b22aadd93..8a7593e12731348cb1ab3f9182ee4bcaac6fc217 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,8 @@ language: cpp
 env:
   global:
     - CTEST_PARALLEL_LEVEL=4
+    - CTEST_OUTPUT_ON_FAILURE=1
+    - MAKEFLAGS="-j2"
 
 matrix:
   include:
@@ -36,10 +38,10 @@ script:
   - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=-w ..
 
   # Build
-  - make -j2
+  - make
 
   # Run unit tests
-  - travis_wait 30 make -j2 test
+  - travis_wait 30 make test
 
   # Make sure we can install and uninstall with no issues
   - sudo make install