diff --git a/.travis.yml b/.travis.yml
index 06016925d7..a7ee996a03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,7 +100,6 @@ script:
   - git submodule update --quiet --init --recursive
   - echo 'Building POSIX Firmware..' && make posix_sitl_default
   - echo 'Running Tests..' && make posix_sitl_default test
-  - echo 'Running Unittests..' && cd unittests && ./run_tests.sh
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
          cd ${TRAVIS_BUILD_DIR}
       && make check_format
@@ -110,7 +109,7 @@ script:
       && echo 'Building UAVCAN node firmware..' && (git clone https://github.com/thiemar/vectorcontrol && cd vectorcontrol && BOARD=s2740vc_1_0 make -s && BOARD=px4esc_1_6 make -s && ../Tools/uavcan_copy.sh)
       && echo 'Building NuttX px4fmu-v4 Firmware..' && make px4fmu-v4_default
       && echo 'Building NuttX px4-stm32f4discovery Firmware..' && make px4-stm32f4discovery_default
-      && echo 'Running Tests..' && make px4fmu-v2_default test
+      && echo 'Running Tests..' && cd unittests && ./run_tests.sh; cd ..
       ;
     fi