diff --git a/.travis.yml b/.travis.yml
index a7ee996a03..3e477a5ef8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -109,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..' && cd unittests && ./run_tests.sh; cd ..
+      && echo 'Running Tests..' && make tests
       ;
     fi
 
diff --git a/Makefile b/Makefile
index 4310e1edcc..248635df96 100644
--- a/Makefile
+++ b/Makefile
@@ -194,6 +194,13 @@ run_sitl_ros: sitl_deprecation
 check_format:
 	@./Tools/check_code_style.sh
 
+check:
+	check_format
+	tests
+
+tests: posix_sitl_default
+	@(cd unittests && ./run_tests.sh)
+
 clean:
 	@rm -rf build_*/
 	@(cd NuttX/nuttx && make clean)
diff --git a/unittests/.gitignore b/unittests/.gitignore
index d5bf4e2412..e9d1bc3e01 100644
--- a/unittests/.gitignore
+++ b/unittests/.gitignore
@@ -1,5 +1,6 @@
 ./obj/*
 gtest_main.a
+dsm_test
 mixer_test
 sf0x_test
 sbus2_test
diff --git a/unittests/run_tests.sh b/unittests/run_tests.sh
index 85aba9bd88..9943fc74c7 100755
--- a/unittests/run_tests.sh
+++ b/unittests/run_tests.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 cmake .
-make clean
-make all -j4
+make --no-print-directory clean
+make --no-print-directory all -j4
 
 set -e