diff --git a/.travis.yml b/.travis.yml
index be7353700..cd2f0c7a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,10 +100,10 @@ before_install:
 
 script:
   - cd ${TRAVIS_BUILD_DIR}
-  - CXXFLAGS="${BUILD_CXXFLAGS}" make -j
+  - CXXFLAGS="${BUILD_CXXFLAGS}" make -j 4
 
   - cd ${TRAVIS_BUILD_DIR}
-  - CXXFLAGS="${TEST_CXXFLAGS}" make -j test
+  - CXXFLAGS="${TEST_CXXFLAGS}" make -j 4 test
   - |
     if [ ${RUNNING_CODECOV} ]; then
       bash <(curl -s https://codecov.io/bash)
diff --git a/Makefile b/Makefile
index 3b1ef1347..bdd14cc16 100644
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,7 @@ unit-tests: $(tests)
       linechars=$$((60 - $${chars}));                   \
 	    line=$$(printf '%*s' $${linechars} | tr ' ' '-'); \
 	    echo -e "\n---[ $${testname} ]$${line}";          \
-	    ASAN_OPTIONS=protect_shadow_gap=0 $$test;         \
+	    ASAN_OPTIONS=protect_shadow_gap=0 $$test 2>&1 | head -n 100; \
 	done
 
 e2e-tests: unit-tests