diff --git a/Makefile b/Makefile
index ef3e474e1..a7cd3433f 100644
--- a/Makefile
+++ b/Makefile
@@ -650,6 +650,7 @@ $(OBJECT_DIR)/$(TARGET)/%.o: %.S
 clean:
 	rm -f $(TARGET_BIN) $(TARGET_HEX) $(TARGET_ELF) $(TARGET_OBJS) $(TARGET_MAP)
 	rm -rf $(OBJECT_DIR)/$(TARGET)
+	cd src/test && $(MAKE) clean || true
 
 flash_$(TARGET): $(TARGET_HEX)
 	stty -F $(SERIAL_DEVICE) raw speed 115200 -crtscts cs8 -parenb -cstopb -ixon
@@ -681,6 +682,10 @@ help:
 	@echo "Valid TARGET values are: $(VALID_TARGETS)"
 	@echo ""
 
+## test        : run the cleanflight test suite
+test:
+	cd src/test && $(MAKE) test || true
+
 # rebuild everything when makefile changes
 $(TARGET_OBJS) : Makefile