diff --git a/make/dirs.mk b/make/dirs.mk
index 382fd31a..1508c84f 100644
--- a/make/dirs.mk
+++ b/make/dirs.mk
@@ -9,7 +9,7 @@ include $(MODDIR)/make/defs.mk
 
 SUBDIRS ?= $(FIND_SUBDIRS)
 
-ifeq ($(SUBDIRS),)
+ifeq ($(SUBDIRS_TO_ITERATE),)
 
 all:
 subdirs:
@@ -18,7 +18,7 @@ clean distclean:
 install:
 
 else
-.PHONY: $(SUBDIRS)
+.PHONY: $(SUBDIRS_TO_ITERATE)
 
 all subdirs:
 	$(make_subdirs)
diff --git a/make/subdirs.mk b/make/subdirs.mk
index c2d61206..42393460 100644
--- a/make/subdirs.mk
+++ b/make/subdirs.mk
@@ -2,17 +2,20 @@ all: all.dirs
 install: install.dirs
 clean: clean.dirs clean.var
 distclean: distclean.dirs distclean.var
+test: test.dirs
 
-ifneq ($(SUBDIRS),)
+ifneq ($(SUBDIRS_TO_ITERATE),)
 all.dirs:
-	set -e; for dir in $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS)); do make -C $$dir all; done
+	set -e; for dir in $(SUBDIRS_TO_ITERATE); do make -C $$dir all; done
 install.dirs:
-	set -e; for dir in $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS)); do make -C $$dir install; done
+	set -e; for dir in $(SUBDIRS_TO_ITERATE); do make -C $$dir install; done
 clean.dirs:
-	set -e; for dir in $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS)); do make -C $$dir clean; done
+	set -e; for dir in $(SUBDIRS_TO_ITERATE); do make -C $$dir clean; done
 	rm -f *.done
 distclean.dirs:
-	set -e; for dir in $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS)); do make -C $$dir distclean; done
+	set -e; for dir in $(SUBDIRS_TO_ITERATE); do make -C $$dir distclean; done
+test.dirs:
+	set -e; for dir in $(SUBDIRS_TO_ITERATE); do make -C $$dir test; done
 
 else