diff --git a/.travis.yml b/.travis.yml
index 28ef5b06..1b68d776 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -101,9 +101,10 @@ before_script:
 
 script:
     - cmake -Werror=dev -DCMAKE_INSTALL_PREFIX=$HOME/fluidsynth_install ${CMAKE_FLAGS} -Denable-portaudio=1 -Denable-ladspa=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_VERBOSE_MAKEFILE=1 -DNO_GUI=1 ..
-    - ${BW} make -j4
+    - echo Can handle `nproc` jobs in parallel
+    - ${BW} make -j`nproc`
     - ls -la
-    - make check
+    - make -j`nproc` check
     - make install
     - cd ..
     - ${SONARSC}
diff --git a/test/test_sfont_unloading.c b/test/test_sfont_unloading.c
index 922a0527..f8c01f67 100644
--- a/test/test_sfont_unloading.c
+++ b/test/test_sfont_unloading.c
@@ -18,7 +18,7 @@ void wait_and_free(fluid_synth_t* synth, int id, const char* calling_func)
         if(fluid_timer_is_running(timer))
         {
             /* timer still running, wait a bit*/
-            fluid_msleep(50 * fluid_timer_get_interval(timer));
+            fluid_msleep(2 * fluid_timer_get_interval(timer));
             TEST_ASSERT(!fluid_timer_is_running(timer));
         }
         delete_fluid_timer(timer);