diff --git a/make/test-exe.mk b/make/test-exe.mk
index 21d5b55b..8632cea2 100644
--- a/make/test-exe.mk
+++ b/make/test-exe.mk
@@ -3,9 +3,7 @@
 # contact@jannet.de
 # $Id$
 
-ifeq ($(EXE),)
-EXE = $(notdir $(shell pwd))
-endif
+EXE = test_$(notdir $(shell pwd))
 
 include $(MODDIR)/make/exe.mk
 
@@ -13,8 +11,9 @@ test: test.done
 clean: testclean
 
 test.done:
-	if ! 2>&1 make run > test.out 2>&1 ; then \
+	if ! 2>&1 make run > test.out 2>&1; then \
 		cat test.out; \
+		exit 1; \
 	fi
 	touch $@