diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk
index fff43c6b47..3e94c35344 100644
--- a/makefiles/config_px4fmu-v1_default.mk
+++ b/makefiles/config_px4fmu-v1_default.mk
@@ -94,8 +94,8 @@ MODULES		+= modules/sdlog2
 #
 # Unit tests
 #
-MODULES 	+= modules/unit_test
-MODULES 	+= modules/commander/commander_tests
+#MODULES 	+= modules/unit_test
+#MODULES 	+= modules/commander/commander_tests
 
 #
 # Library modules
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk
index ab0da35596..bd73bde5ea 100644
--- a/makefiles/config_px4fmu-v2_default.mk
+++ b/makefiles/config_px4fmu-v2_default.mk
@@ -88,8 +88,8 @@ MODULES		+= modules/sdlog2
 #
 # Unit tests
 #
-MODULES 	+= modules/unit_test
-MODULES 	+= modules/commander/commander_tests
+#MODULES 	+= modules/unit_test
+#MODULES 	+= modules/commander/commander_tests
 
 #
 # Library modules