diff --git a/test/Makefile b/test/Makefile
index bb3282619..3bdabc318 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -19,4 +19,5 @@ fault-injection: .FORCE
 
 zdtm_ns: $(shell echo "$(TST)" | tr ' ' '\n' | grep -P $(EXP))
 $(TST):
-	./zdtm.sh ${ZDTM_ARGS} $(@) &> $(subst /,_,$@).log
+	./zdtm.sh ${ZDTM_ARGS} $(@) &> $(subst /,_,$@).log || \
+	{ flock Makefile cat $(subst /,_,$@).log; exit 1; }