diff --git a/Makefile.include b/Makefile.include
index 2c20082144..a12d242b33 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -637,16 +637,17 @@ flash-only: $(FLASHDEPS)
 preflash: $(BUILD_BEFORE_FLASH)
 	$(PREFLASHER) $(PREFFLAGS)
 
+TERMFLASHDEPS ?= $(filter flash flash-only,$(MAKECMDGOALS))
 termdeps: $(TERMDEPS)
 
-term: $(filter flash flash-only, $(MAKECMDGOALS)) $(TERMDEPS)
+term: $(TERMFLASHDEPS) $(TERMDEPS)
 	$(call check_cmd,$(TERMPROG),Terminal program)
 	$(TERMPROG) $(TERMFLAGS)
 
 # Term without the pyterm added logging
 # TERMFLAGS must be exported for `jlink.sh term_rtt`.
 cleanterm: export PYTERMFLAGS += --noprefix --no-repeat-command-on-empty-line
-cleanterm: $(filter flash flash-only, $(MAKECMDGOALS)) $(TERMDEPS)
+cleanterm: $(TERMFLASHDEPS) $(TERMDEPS)
 	$(call check_cmd,$(TERMPROG),Terminal program)
 	$(TERMPROG) $(TERMFLAGS)