diff --git a/make/run.mk b/make/run.mk
index 87fbc31e..7f884195 100644
--- a/make/run.mk
+++ b/make/run.mk
@@ -3,7 +3,15 @@
 # contact@jannet.de
 # $Id$
 
-EXE_BASENAME ?= $(notdir $(shell pwd))
+DIR_BASENAME = $(notdir $(shell pwd))
+
+ifeq ($(EXE_BASENAME),)
+  ifneq ($(DIR_BASENAME),test)
+    EXE_BASENAME = $(DIR_BASENAME)
+  else
+    EXE_BASENAME = test-$(notdir $(shell cd ..; pwd))
+  endif
+endif
 
 include $(MODDIR)/make/defs.mk
 BUILD_HDR =