diff --git a/Makefile b/Makefile
index e387710f223..648f276d350 100644
--- a/Makefile
+++ b/Makefile
@@ -123,31 +123,12 @@ bench:
 # reviewed before checking in.
 .PHONY: output
 output:				\
-	output-error-messages	\
-	output-pretty-printing	\
-	output-ide-emacs	\
-	output-ide-lsp		\
-	output-bug-reports
-
-.PHONY: output-error-messages
-output-error-messages:
-	+$(Q)$(MAKE) -C tests/error-messages accept
-
-.PHONY: output-pretty-printing
-output-pretty-printing:
-	+$(Q)$(MAKE) -C tests/prettyprinting accept
-
-.PHONY: output-ide-emacs
-output-ide-emacs:
-	+$(Q)$(MAKE) -C tests/ide/emacs accept
-
-.PHONY: output-ide-lsp
-output-ide-lsp:
-	+$(Q)$(MAKE) -C tests/ide/lsp accept
-
-.PHONY: output-bug-reports
-output-bug-reports:
-	+$(Q)$(MAKE) -C tests/bug-reports output-accept
+	output--examples	\
+	output--tests
+
+.PHONY: output--%
+output--%:
+	+$(Q)$(MAKE) -C $* accept
 
 # This rule is meant to mimic what the docker based CI does, but it
 # is not perfect. In particular it will not look for a diff on the
diff --git a/examples/Makefile b/examples/Makefile
index 1fd9d0d156e..f5dc86c1822 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,6 +1,7 @@
-rel.__all: dm4free.__all
-# ^ rel uses modules from dm4free, make sure to check them
-# in proper order.
+rel.__all: dm4free.__verify
+rel.__accept: dm4free.__verify
+# ^ rel uses modules from dm4free, make sure to check them in proper
+# order.
 
 SUBDIRS += algorithms
 SUBDIRS += crypto
diff --git a/mk/test.mk b/mk/test.mk
index 7066d2ab43e..39b30ebf1ab 100644
--- a/mk/test.mk
+++ b/mk/test.mk
@@ -142,14 +142,14 @@ __all: $(addsuffix .__all, $(SUBDIRS_ALL))
 all: __all
 
 # __verify: check all files here and in subdirectories (SUBDIRS / SUBDIRS_VERIFY)
-# Implied by 'all'
+# Implied by 'all' for each directory, but we cannot write 'all: verify' or we
+# will get duplicate invocations for all/verify on a same subdir, and they overlap.
 SUBDIRS_VERIFY += $(SUBDIRS)
 ifeq ($(NOVERIFY),)
 __verify: $(ALL_CHECKED_FILES)
 endif
 __verify: $(addsuffix .__verify, $(SUBDIRS_VERIFY))
 verify: __verify
-all: verify
 
 # clean
 SUBDIRS_CLEAN += $(SUBDIRS)