diff --git a/tests/regression/d2q9/Makefile b/tests/regression/d2q9/Makefile
index a61a537a..0c006ae9 100644
--- a/tests/regression/d2q9/Makefile
+++ b/tests/regression/d2q9/Makefile
@@ -2,17 +2,23 @@
 #
 #  Makefile
 #
-#  D2Q9 regression tests
-#
 ###############################################################################
 
 include ../../../Makefile.mk
 
 PAR=${LAUNCH_MPIRUN_CMD}
 
-d2q9:
-	@echo "TEST --> regression tests (d2q9)"
-	inputs='serial*inp'; \
-	for file in $$inputs; do ../../test.sh $$file "" "$(PAR)"; done
+SOURCES = $(wildcard *.inp)
+LOGS    = ${SOURCES:.inp=.new}
+
+test:
+	$(MAKE) -s clean
+	$(MAKE) -s logs
+	@echo End of tests.
+
+logs:	$(LOGS)
+
+%.new:	%.inp
+	../../test.sh $< "" "${PAR}"
 clean:
-	rm -f *new test-diff* input
+	rm -f *new test-diff* *meta *001-001
diff --git a/tests/regression/d3q15/Makefile b/tests/regression/d3q15/Makefile
index 15c7cbc0..0c006ae9 100644
--- a/tests/regression/d3q15/Makefile
+++ b/tests/regression/d3q15/Makefile
@@ -2,17 +2,23 @@
 #
 #  Makefile
 #
-#  D3Q15 regression tests
-#
 ###############################################################################
 
 include ../../../Makefile.mk
 
 PAR=${LAUNCH_MPIRUN_CMD}
 
-serial:
-	@echo "TEST --> regression tests (d3q15)"
-	inputs='serial*inp'; \
-	for file in $$inputs; do ../../test.sh $$file "" "$(PAR)"; done
+SOURCES = $(wildcard *.inp)
+LOGS    = ${SOURCES:.inp=.new}
+
+test:
+	$(MAKE) -s clean
+	$(MAKE) -s logs
+	@echo End of tests.
+
+logs:	$(LOGS)
+
+%.new:	%.inp
+	../../test.sh $< "" "${PAR}"
 clean:
-	rm -f *new test-diff* input
+	rm -f *new test-diff* *meta *001-001