diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 5074d515499..9c9b3be1e0b 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -91,6 +91,10 @@ SELECTOR_DEFAULT = (quote (not (tag :expensive-test)))
 SELECTOR_EXPENSIVE = nil
 ifdef SELECTOR
 SELECTOR_ACTUAL=$(SELECTOR)
+else ifndef MAKECMDGOALS
+SELECTOR_ACTUAL=$(SELECTOR_DEFAULT)
+else ifeq ($(MAKECMDGOALS),all)
+SELECTOR_ACTUAL=$(SELECTOR_DEFAULT)
 else ifeq ($(MAKECMDGOALS),check)
 SELECTOR_ACTUAL=$(SELECTOR_DEFAULT)
 else ifeq ($(MAKECMDGOALS),check-maybe)