Eliminate TEST.

author: Ralf Corsepius <ralf.corsepius@rtems.org> 2005-11-11 09:03:24 +0000
committer: Ralf Corsepius <ralf.corsepius@rtems.org> 2005-11-11 09:03:24 +0000
commit: 7e3887773ab0c62e82e34e2fac42f5e1acf66794 (patch)
tree: 7e3d5559fef65afc77f5ef1a95c2694b46cbde72 /testsuites
parent: JOEL, this file is dead. Don't re-add it. (diff)
download: rtems-7e3887773ab0c62e82e34e2fac42f5e1acf66794.tar.bz2
145 files changed, 787 insertions, 932 deletions
diff --git a/testsuites/itrontests/itronhello/Makefile.am b/testsuites/itrontests/itronhello/Makefile.am
index 5dd35d0551..e9b334460b 100644
--- a/testsuites/itrontests/itronhello/Makefile.am
+++ b/testsuites/itrontests/itronhello/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itronhello
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itronhello.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itronhello.doc itronhello.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itronhello.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itronhello.scn: itronhello.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itronhello.exe \
+$(project_bspdir)/tests/screens/itrontests/itronhello.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itronmbf01/Makefile.am b/testsuites/itrontests/itronmbf01/Makefile.am
index 933c62fcb6..90d77c3713 100644
--- a/testsuites/itrontests/itronmbf01/Makefile.am
+++ b/testsuites/itrontests/itronmbf01/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itronmbf01
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itronmbf01.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itronmbf01.doc itronmbf01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itronmbf01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itronmbf01.scn: itronmbf01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itronmbf01.exe \
+$(project_bspdir)/tests/screens/itrontests/itronmbf01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itronmbox01/Makefile.am b/testsuites/itrontests/itronmbox01/Makefile.am
index 8494611891..cf7a3ba64a 100644
--- a/testsuites/itrontests/itronmbox01/Makefile.am
+++ b/testsuites/itrontests/itronmbox01/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itronmbox01
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itronmbox01.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itronmbox01.doc itronmbox01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itronmbox01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itronmbox01.scn: itronmbox01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itronmbox01.exe \
+$(project_bspdir)/tests/screens/itrontests/itronmbox01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itronsem01/Makefile.am b/testsuites/itrontests/itronsem01/Makefile.am
index bba13e2f95..f8d34be82c 100644
--- a/testsuites/itrontests/itronsem01/Makefile.am
+++ b/testsuites/itrontests/itronsem01/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itronsem01
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itronsem01.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itronsem01.doc itronsem01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itronsem01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itronsem01.scn: itronsem01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itronsem01.exe \
+$(project_bspdir)/tests/screens/itrontests/itronsem01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itrontask01/Makefile.am b/testsuites/itrontests/itrontask01/Makefile.am
index c1dd91b933..8c7ee9a351 100644
--- a/testsuites/itrontests/itrontask01/Makefile.am
+++ b/testsuites/itrontests/itrontask01/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itrontask01
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itrontask01.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itrontask01.doc itrontask01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itrontask01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itrontask01.scn: itrontask01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itrontask01.exe \
+$(project_bspdir)/tests/screens/itrontests/itrontask01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itrontask02/Makefile.am b/testsuites/itrontests/itrontask02/Makefile.am
index fe77ffba4e..54d5bd6aa4 100644
--- a/testsuites/itrontests/itrontask02/Makefile.am
+++ b/testsuites/itrontests/itrontask02/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itrontask02
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itrontask02.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c dormant.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itrontask02.doc itrontask02.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itrontask02.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itrontask02.scn: itrontask02.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itrontask02.exe \
+$(project_bspdir)/tests/screens/itrontests/itrontask02.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itrontask03/Makefile.am b/testsuites/itrontests/itrontask03/Makefile.am
index 60fb4aaac6..549c8bbe3b 100644
--- a/testsuites/itrontests/itrontask03/Makefile.am
+++ b/testsuites/itrontests/itrontask03/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itrontask03
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itrontask03.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itrontask03.doc itrontask03.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itrontask03.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itrontask03.scn: itrontask03.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itrontask03.exe \
+$(project_bspdir)/tests/screens/itrontests/itrontask03.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itrontask04/Makefile.am b/testsuites/itrontests/itrontask04/Makefile.am
index 1165e767fd..ce94c5625f 100644
--- a/testsuites/itrontests/itrontask04/Makefile.am
+++ b/testsuites/itrontests/itrontask04/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itrontask04
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itrontask04.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itrontask04.doc itrontask04.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itrontask04.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itrontask04.scn: itrontask04.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itrontask04.exe \
+$(project_bspdir)/tests/screens/itrontests/itrontask04.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itrontime01/Makefile.am b/testsuites/itrontests/itrontime01/Makefile.am
index c84d9d698c..c112dabad4 100644
--- a/testsuites/itrontests/itrontime01/Makefile.am
+++ b/testsuites/itrontests/itrontime01/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itrontime01
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itrontime01.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itrontime01.doc itrontime01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itrontime01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itrontime01.scn: itrontime01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itrontime01.exe \
+$(project_bspdir)/tests/screens/itrontests/itrontime01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/libtests/cpuuse/Makefile.am b/testsuites/libtests/cpuuse/Makefile.am
index cad9fcce24..848446c8a0 100644
--- a/testsuites/libtests/cpuuse/Makefile.am
+++ b/testsuites/libtests/cpuuse/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = cpuuse
 
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
 
-DOCS = $(TEST).scn
+DOCS = cpuuse.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/cpuuse.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/cpuuse.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/cpuuse.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/libtests/malloctest/Makefile.am b/testsuites/libtests/malloctest/Makefile.am
index 972e178b52..874453669e 100644
--- a/testsuites/libtests/malloctest/Makefile.am
+++ b/testsuites/libtests/malloctest/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = malloctest
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = $(TEST).scn
+DOCS = malloctest.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/malloctest.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/malloctest.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/malloctest.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/libtests/monitor/Makefile.am b/testsuites/libtests/monitor/Makefile.am
index 3215fbbda9..91f5e31f2b 100644
--- a/testsuites/libtests/monitor/Makefile.am
+++ b/testsuites/libtests/monitor/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-TEST = monitor
 
 MANAGERS = dpmem event io msg mp part region sem signal timer rate_monotonic \
     ext
@@ -10,12 +9,12 @@ MANAGERS = dpmem event io msg mp part region sem signal timer rate_monotonic \
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).scn
+DOCS = monitor.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/monitor.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -27,10 +26,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/monitor.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/monitor.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/libtests/putenvtest/Makefile.am b/testsuites/libtests/putenvtest/Makefile.am
index f3de81100a..083edfd0c0 100644
--- a/testsuites/libtests/putenvtest/Makefile.am
+++ b/testsuites/libtests/putenvtest/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-TEST = putenvtest
 
 MANAGERS = io
 
@@ -14,7 +13,7 @@ DOCS =
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/putenvtest.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/putenvtest.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/putenvtest.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/libtests/rtems++/Makefile.am b/testsuites/libtests/rtems++/Makefile.am
index f9389278ab..d9f0c7f1f3 100644
--- a/testsuites/libtests/rtems++/Makefile.am
+++ b/testsuites/libtests/rtems++/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-TEST = rtems++
 
 MANAGERS = event io msg sem signal timer rate_monotonic
 
@@ -11,11 +10,11 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h
 endif
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = rtems++.scn rtems++.doc
 
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/rtems++.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -27,10 +26,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/rtems++.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/rtems++.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/libtests/rtmonuse/Makefile.am b/testsuites/libtests/rtmonuse/Makefile.am
index a523629d94..18a7b81897 100644
--- a/testsuites/libtests/rtmonuse/Makefile.am
+++ b/testsuites/libtests/rtmonuse/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = rtmonuse
 
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c getall.c task1.c system.h
 
-DOCS = $(TEST).scn
+DOCS = rtmonuse.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/rtmonuse.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/rtmonuse.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/rtmonuse.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/libtests/stackchk/Makefile.am b/testsuites/libtests/stackchk/Makefile.am
index 39f0dac4b8..42fc0d455b 100644
--- a/testsuites/libtests/stackchk/Makefile.am
+++ b/testsuites/libtests/stackchk/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = stackchk
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = blow.c init.c task1.c system.h
 
-DOCS = $(TEST).scn
+DOCS = stackchk.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/stackchk.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/stackchk.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/stackchk.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/libtests/termios/Makefile.am b/testsuites/libtests/termios/Makefile.am
index bc980b45b3..1748510002 100644
--- a/testsuites/libtests/termios/Makefile.am
+++ b/testsuites/libtests/termios/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-TEST = termios
 
 MANAGERS = io
 
@@ -14,7 +13,7 @@ DOCS =
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/termios.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/termios.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/termios.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index 7c1f4a59a5..cf23e34828 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp01-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp01-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp01-node$(NODE).doc mp01-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn: mp01-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am
index b2e7c54abc..fa26eabc6d 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp01-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp01-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp01-node$(NODE).doc mp01-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn: mp01-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am
index 485fa7e236..766d461a27 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp02-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp02-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp02-node$(NODE).doc mp02-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn: mp02-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am
index cc3c54d656..a7f49726c1 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp02-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp02-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp02-node$(NODE).doc mp02-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn: mp02-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am
index 9bd2613069..6ed3a5c7d8 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp03-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp03-node$(NODE).exe
 
 MANAGERS = io mp timer event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../delay.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp03-node$(NODE).doc mp03-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn: mp03-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am
index 33141a6af9..34d2287a43 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp03-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp03-node$(NODE).exe
 
 MANAGERS = io mp timer event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../delay.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp03-node$(NODE).doc mp03-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn: mp03-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am
index 3b1ddc1d8f..45869cec51 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp04-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp04-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp04-node$(NODE).doc mp04-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn: mp04-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am
index 7ce315ff7a..6fc6282348 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp04-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp04-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp04-node$(NODE).doc mp04-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn: mp04-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am
index 3bfeec110c..cf4a5ce2b1 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp05-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp05-node$(NODE).exe
 
 MANAGERS = io mp signal timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp05-node$(NODE).doc mp05-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn: mp05-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am
index ee15c0baf6..038949007e 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp05-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp05-node$(NODE).exe
 
 MANAGERS = io mp signal timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp05-node$(NODE).doc mp05-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn: mp05-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am
index bcd2c0a421..cd9356fc66 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp06-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp06-node$(NODE).exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp06-node$(NODE).doc mp06-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn: mp06-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am
index 0db9b3e722..07683fc167 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp06-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp06-node$(NODE).exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp06-node$(NODE).doc mp06-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn: mp06-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am
index d985ce3212..d7eae32b82 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp07-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp07-node$(NODE).exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp07-node$(NODE).doc mp07-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn: mp07-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am
index 96d4a6954e..4e52a36414 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp07-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp07-node$(NODE).exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp07-node$(NODE).doc mp07-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn: mp07-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am
index f2f4e91091..a4fd3ecea0 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp08-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp08-node$(NODE).exe
 
 MANAGERS = io mp semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp08-node$(NODE).doc mp08-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn: mp08-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am
index 6d90bab965..a245e3d98e 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp08-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp08-node$(NODE).exe
 
 MANAGERS = io mp semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp08-node$(NODE).doc mp08-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn: mp08-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index 95253efda2..2275870040 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp09-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp09-node$(NODE).exe
 
 MANAGERS = io mp message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp09-node$(NODE).doc mp09-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn: mp09-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index a7c5837f85..268e1c6d8b 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp09-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp09-node$(NODE).exe
 
 MANAGERS = io mp message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp09-node$(NODE).doc mp09-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn: mp09-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
index 3e46ccc7a4..44cbbe7ef3 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp10-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp10-node$(NODE).exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp10-node$(NODE).doc mp10-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn: mp10-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
index 3bbff1a5bd..614f62af2f 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp10-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp10-node$(NODE).exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp10-node$(NODE).doc mp10-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn: mp10-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am
index 3b11f573fe..7b36f144b7 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp11-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp11-node$(NODE).exe
 
 MANAGERS = io mp message partition semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp11-node$(NODE).doc mp11-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn: mp11-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am
index e6414d29d5..4f55a883bc 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp11-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp11-node$(NODE).exe
 
 MANAGERS = io mp message partition semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp11-node$(NODE).doc mp11-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn: mp11-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am
index eb98e15b80..7eba1e7915 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp12-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp12-node$(NODE).exe
 
 MANAGERS = io mp partition
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp12-node$(NODE).doc mp12-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn: mp12-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am
index 7cec266f6e..938e069431 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp12-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp12-node$(NODE).exe
 
 MANAGERS = io mp partition
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp12-node$(NODE).doc mp12-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn: mp12-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am
index fd2a2cb401..a862abb9a0 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp13-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp13-node$(NODE).exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp13-node$(NODE).doc mp13-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn: mp13-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am
index 8432a12b6c..3b52d53b44 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp13-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp13-node$(NODE).exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp13-node$(NODE).doc mp13-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn: mp13-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index 0da54e7465..7ceb4a3a0b 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -3,8 +3,7 @@
 ##
 
 NODE = 1
-TEST = mp14-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp14-node$(NODE).exe
 
 MANAGERS = io mp event partition semaphore timer message
 
@@ -12,7 +11,7 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp14-node$(NODE).doc mp14-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -27,19 +26,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn: mp14-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index e99a115c5d..fbefb3a6b8 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -3,8 +3,7 @@
 ##
 
 NODE = 2
-TEST = mp14-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp14-node$(NODE).exe
 
 MANAGERS = io mp event partition semaphore timer message
 
@@ -12,7 +11,7 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp14-node$(NODE).doc mp14-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -27,19 +26,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn: mp14-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
index 25e50e57e5..3fc1535590 100644
--- a/testsuites/psxtests/psx01/Makefile.am
+++ b/testsuites/psxtests/psx01/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx01
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx01.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx01.scn: psx01.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx01.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx02/Makefile.am b/testsuites/psxtests/psx02/Makefile.am
index 196400b2e9..44a32d1822 100644
--- a/testsuites/psxtests/psx02/Makefile.am
+++ b/testsuites/psxtests/psx02/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx02
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx02.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx02.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx02.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx02.scn: psx02.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx02.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx02.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx03/Makefile.am b/testsuites/psxtests/psx03/Makefile.am
index 4a8a1c72a7..434d4638a5 100644
--- a/testsuites/psxtests/psx03/Makefile.am
+++ b/testsuites/psxtests/psx03/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx03
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx03.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx03.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx03.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx03.scn: psx03.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx03.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx03.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx04/Makefile.am b/testsuites/psxtests/psx04/Makefile.am
index 312486bf76..b1331c6d2a 100644
--- a/testsuites/psxtests/psx04/Makefile.am
+++ b/testsuites/psxtests/psx04/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx04
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx04.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx04.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx04.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx04.scn: psx04.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx04.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx04.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx05/Makefile.am b/testsuites/psxtests/psx05/Makefile.am
index 6dc982840f..9190602426 100644
--- a/testsuites/psxtests/psx05/Makefile.am
+++ b/testsuites/psxtests/psx05/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx05
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx05.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx05.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx05.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx05.scn: psx05.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx05.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx05.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx06/Makefile.am b/testsuites/psxtests/psx06/Makefile.am
index bec55c0519..522735321d 100644
--- a/testsuites/psxtests/psx06/Makefile.am
+++ b/testsuites/psxtests/psx06/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx06
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c task2.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx06.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx06.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx06.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx06.scn: psx06.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx06.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx06.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx07/Makefile.am b/testsuites/psxtests/psx07/Makefile.am
index f60da422a6..530fc70cd8 100644
--- a/testsuites/psxtests/psx07/Makefile.am
+++ b/testsuites/psxtests/psx07/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx07
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx07.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx07.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx07.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx07.scn: psx07.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx07.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx07.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx08/Makefile.am b/testsuites/psxtests/psx08/Makefile.am
index c5e65006c3..802bfe5e6d 100644
--- a/testsuites/psxtests/psx08/Makefile.am
+++ b/testsuites/psxtests/psx08/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx08
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx08.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx08.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx08.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx08.scn: psx08.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx08.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx08.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx09/Makefile.am b/testsuites/psxtests/psx09/Makefile.am
index f508d7ed94..fd55d5d13f 100644
--- a/testsuites/psxtests/psx09/Makefile.am
+++ b/testsuites/psxtests/psx09/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx09
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx09.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx09.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx09.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx09.scn: psx09.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx09.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx09.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx10/Makefile.am b/testsuites/psxtests/psx10/Makefile.am
index 12d0b50261..2179dfc328 100644
--- a/testsuites/psxtests/psx10/Makefile.am
+++ b/testsuites/psxtests/psx10/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx10
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx10.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx10.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx10.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx10.scn: psx10.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx10.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx10.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx11/Makefile.am b/testsuites/psxtests/psx11/Makefile.am
index f18ea917fe..a0befa0eda 100644
--- a/testsuites/psxtests/psx11/Makefile.am
+++ b/testsuites/psxtests/psx11/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx11
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx11.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx11.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx11.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx11.scn: psx11.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx11.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx11.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx12/Makefile.am b/testsuites/psxtests/psx12/Makefile.am
index 4256d652b0..ab0bf4bf7f 100644
--- a/testsuites/psxtests/psx12/Makefile.am
+++ b/testsuites/psxtests/psx12/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx12
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx12.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx12.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx12.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx12.scn: psx12.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx12.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx12.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psx13/Makefile.am b/testsuites/psxtests/psx13/Makefile.am
index 1c6370a3b5..268a9f33a5 100644
--- a/testsuites/psxtests/psx13/Makefile.am
+++ b/testsuites/psxtests/psx13/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psx13
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psx13.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psx13.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psx13.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psx13.scn: psx13.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psx13.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx13.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psxcancel/Makefile.am b/testsuites/psxtests/psxcancel/Makefile.am
index b11b674f58..6f41e9bde9 100644
--- a/testsuites/psxtests/psxcancel/Makefile.am
+++ b/testsuites/psxtests/psxcancel/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psxcancel
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psxcancel.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psxcancel.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psxcancel.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psxcancel.scn: psxcancel.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psxcancel.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxcancel.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psxchroot01/Makefile.am b/testsuites/psxtests/psxchroot01/Makefile.am
index 2d87844ae8..ff96544eab 100644
--- a/testsuites/psxtests/psxchroot01/Makefile.am
+++ b/testsuites/psxtests/psxchroot01/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psxchroot01
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psxchroot01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psxchroot01.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psxchroot01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psxchroot01.scn: psxchroot01.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psxchroot01.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxchroot01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psxfile01/Makefile.am b/testsuites/psxtests/psxfile01/Makefile.am
index 7e8b6137cd..3a9a3fe0a3 100644
--- a/testsuites/psxtests/psxfile01/Makefile.am
+++ b/testsuites/psxtests/psxfile01/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psxfile01
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c test_cat.c test_extend.c test_write.c ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psxfile01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psxfile01.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psxfile01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psxfile01.scn: psxfile01.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psxfile01.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxfile01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psxmount/Makefile.am b/testsuites/psxtests/psxmount/Makefile.am
index 07d4b4b8ac..8d1dec251d 100644
--- a/testsuites/psxtests/psxmount/Makefile.am
+++ b/testsuites/psxtests/psxmount/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psxmount
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psxmount.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psxmount.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psxmount.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psxmount.scn: psxmount.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psxmount.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxmount.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psxmsgq01/Makefile.am b/testsuites/psxtests/psxmsgq01/Makefile.am
index 563bd4e53d..b32d19026b 100644
--- a/testsuites/psxtests/psxmsgq01/Makefile.am
+++ b/testsuites/psxtests/psxmsgq01/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psxmsgq01
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psxmsgq01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psxmsgq01.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psxmsgq01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psxmsgq01.scn: psxmsgq01.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psxmsgq01.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxmsgq01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psxreaddir/Makefile.am b/testsuites/psxtests/psxreaddir/Makefile.am
index 162cae0c45..f7153dbc7e 100644
--- a/testsuites/psxtests/psxreaddir/Makefile.am
+++ b/testsuites/psxtests/psxreaddir/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psxreaddir
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psxreaddir.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psxreaddir.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psxreaddir.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psxreaddir.scn: psxreaddir.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psxreaddir.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxreaddir.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psxsem01/Makefile.am b/testsuites/psxtests/psxsem01/Makefile.am
index acb5fcb22b..ab1f1d4497 100644
--- a/testsuites/psxtests/psxsem01/Makefile.am
+++ b/testsuites/psxtests/psxsem01/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psxsem01
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psxsem01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psxsem01.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psxsem01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psxsem01.scn: psxsem01.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psxsem01.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxsem01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psxstat/Makefile.am b/testsuites/psxtests/psxstat/Makefile.am
index 4ccceb1763..cd0ca857fc 100644
--- a/testsuites/psxtests/psxstat/Makefile.am
+++ b/testsuites/psxtests/psxstat/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psxstat
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psxstat.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psxstat.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psxstat.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psxstat.scn: psxstat.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psxstat.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxstat.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psxtime/Makefile.am b/testsuites/psxtests/psxtime/Makefile.am
index 06313eb3dd..deb02eb827 100644
--- a/testsuites/psxtests/psxtime/Makefile.am
+++ b/testsuites/psxtests/psxtime/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psxtime
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c
 
-DOCS = $(TEST).scn
+DOCS = psxtime.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psxtime.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psxtime.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psxtime.scn: psxtime.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psxtime.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxtime.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/psxtests/psxtimer/Makefile.am b/testsuites/psxtests/psxtimer/Makefile.am
index 7e20fa8ad1..031c7def3e 100644
--- a/testsuites/psxtests/psxtimer/Makefile.am
+++ b/testsuites/psxtests/psxtimer/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = psxtimer
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = psxtimer.c system.h ../include/pmacros.h
 
-DOCS = $(TEST).scn
+DOCS = psxtimer.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/psxtimer.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/psxtimer.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/psxtests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
 	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+$(project_bspdir)/tests/screens/psxtests/psxtimer.scn: psxtimer.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/psxtimer.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxtimer.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index 42f81b5312..06525c5154 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = base_mp-node$(NODE)
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/base_mp-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../apptask.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = base_mp-node$(NODE).doc base_mp-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -29,14 +28,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/base_mp-node$(NODE).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/base_mp-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/base_mp-node$(NODE).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/base_mp-node$(NODE).exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index 039f19db08..2e027a4b5a 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = base_mp-node$(NODE)
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/base_mp-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../apptask.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = base_mp-node$(NODE).doc base_mp-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -29,14 +28,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/base_mp-node$(NODE).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/base_mp-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/base_mp-node$(NODE).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/base_mp-node$(NODE).exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index 5aec7911d3..7ccbaff66a 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -2,15 +2,14 @@
 ##  $Id$
 ##
 
-TEST = base_sp
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/base_sp.exe
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c apptask.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = base_sp.doc base_sp.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -28,14 +27,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/base_sp.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/base_sp.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/base_sp.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/base_sp.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 8dc5a5acf4..980ff82f55 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -2,15 +2,14 @@
 ##  $Id$
 ##
 
-TEST = cdtest
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/cdtest.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c main.cc system.h
 
-DOCS = $(TEST).scn
+DOCS = cdtest.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -28,14 +27,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/cdtest.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/cdtest.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/cdtest.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/cdtest.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 256bbe72e7..dba91bebcb 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -2,8 +2,7 @@
 ##  Makefile.am,v 1.9 2002/08/11 05:18:59 ralf Exp
 ##
 
-TEST = fileio
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/fileio.exe
 
 MANAGERS = io message semaphore
 
@@ -13,7 +12,7 @@ lib_a_SOURCES = init.c system.h
 OBJS = $(lib_a_OBJECTS)
 endif
 
-DOCS = $(TEST).doc
+DOCS = fileio.doc
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -28,14 +27,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/fileio.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/fileio.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/fileio.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/fileio.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index ffc86c89a2..75d8c1ed0a 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -2,15 +2,14 @@
 ##  $Id$
 ##
 
-TEST = hello
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/hello.exe
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = hello.doc hello.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -28,14 +27,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/hello.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/hello.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/hello.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/hello.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index 8c1edd6d9d..38d467ae35 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -2,15 +2,14 @@
 ##  $Id$
 ##
 
-TEST = iostream
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/iostream.exe
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.cc system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = iostream.doc iostream.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -28,14 +27,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/iostream.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/iostream.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/iostream.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/iostream.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 287ed218c5..7eb3ac0e33 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -2,15 +2,14 @@
 ##  $Id$
 ##
 
-TEST = loopback
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/loopback.exe
 
 MANAGERS = io event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = $(TEST).scn
+DOCS = loopback.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -28,14 +27,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/loopback.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/loopback.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/loopback.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/loopback.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index e303605ba4..15c6a4b643 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -2,15 +2,14 @@
 ##  $Id$
 ##
 
-TEST = minimum
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/minimum.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = minimum.doc minimum.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -28,14 +27,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/minimum.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/minimum.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/minimum.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/minimum.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index 8f745ae2de..559d14667b 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -2,15 +2,14 @@
 ##  $Id$
 ##
 
-TEST = paranoia
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/paranoia.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c paranoia.c system.h
 
-DOCS = $(TEST).doc
+DOCS = paranoia.doc
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -28,14 +27,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/paranoia.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/paranoia.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/paranoia.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/paranoia.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index a6ae08c8c6..f8c8aa6c2f 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -2,8 +2,7 @@
 ##  $Id$
 ##
 
-TEST = pppd
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/pppd.exe
 
 MANAGERS = io event semaphore
 
@@ -26,14 +25,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/pppd.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/pppd.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/pppd.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/pppd.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 2640dfd5ab..2fe9f392a5 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -2,15 +2,14 @@
 ##  $Id$
 ##
 
-TEST = ticker
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/ticker.exe
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c tasks.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = ticker.doc ticker.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -28,14 +27,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/ticker.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/ticker.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/ticker.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/ticker.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index e2753aed71..8fbd478811 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -2,15 +2,14 @@
 ##  $Id$
 ##
 
-TEST = unlimited
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/unlimited.exe
 
 MANAGERS = io event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c test1.c test2.c test3.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = unlimited.doc unlimited.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -28,14 +27,14 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/unlimited.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/unlimited.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/unlimited.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/unlimited.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp01/Makefile.am b/testsuites/sptests/sp01/Makefile.am
index 115824b70e..fd5a8a7726 100644
--- a/testsuites/sptests/sp01/Makefile.am
+++ b/testsuites/sptests/sp01/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp01
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp01.scn sp01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp01.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp01.scn: sp01.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp01.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp02/Makefile.am b/testsuites/sptests/sp02/Makefile.am
index 4f923fa325..9336e3602c 100644
--- a/testsuites/sptests/sp02/Makefile.am
+++ b/testsuites/sptests/sp02/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp02
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c preempt.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp02.scn sp02.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp02.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp02.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp02.scn: sp02.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp02.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp02.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp03/Makefile.am b/testsuites/sptests/sp03/Makefile.am
index e3876b4734..a80781002e 100644
--- a/testsuites/sptests/sp03/Makefile.am
+++ b/testsuites/sptests/sp03/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp03
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp03.scn sp03.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp03.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp03.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp03.scn: sp03.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp03.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp03.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp04/Makefile.am b/testsuites/sptests/sp04/Makefile.am
index 8a4662f959..8b43278a3f 100644
--- a/testsuites/sptests/sp04/Makefile.am
+++ b/testsuites/sptests/sp04/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp04
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp04.scn sp04.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp04.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp04.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp04.scn: sp04.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp04.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp04.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp05/Makefile.am b/testsuites/sptests/sp05/Makefile.am
index 9df5b9e2fb..ac1bd05b8e 100644
--- a/testsuites/sptests/sp05/Makefile.am
+++ b/testsuites/sptests/sp05/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp05
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp05.scn sp05.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp05.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp05.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp05.scn: sp05.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp05.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp05.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp06/Makefile.am b/testsuites/sptests/sp06/Makefile.am
index b267bdded9..79fecb0c1a 100644
--- a/testsuites/sptests/sp06/Makefile.am
+++ b/testsuites/sptests/sp06/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp06
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp06.scn sp06.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp06.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp06.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp06.scn: sp06.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp06.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp06.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp07/Makefile.am b/testsuites/sptests/sp07/Makefile.am
index 18a77380ef..f58f30e226 100644
--- a/testsuites/sptests/sp07/Makefile.am
+++ b/testsuites/sptests/sp07/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-TEST = sp07
 
 MANAGERS = io
 
@@ -10,12 +9,12 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c buffered_io.c task1.c task2.c task3.c task4.c taskexit.c \
     tcreate.c tdelete.c trestart.c tstart.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp07.scn sp07.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp07.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -27,18 +26,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp07.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp07.scn: sp07.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp07.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp07.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp08/Makefile.am b/testsuites/sptests/sp08/Makefile.am
index d2c424b553..a73afd5743 100644
--- a/testsuites/sptests/sp08/Makefile.am
+++ b/testsuites/sptests/sp08/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp08
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp08.scn sp08.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp08.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp08.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp08.scn: sp08.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp08.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp08.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index dea4737e4d..0cba23a682 100644
--- a/testsuites/sptests/sp09/Makefile.am
+++ b/testsuites/sptests/sp09/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-TEST = sp09
 
 MANAGERS = io message dual_ported_memory event multi_processor region \
     semaphore signal rate_monotonic timer partition
@@ -13,12 +12,12 @@ lib_a_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c
     screen11.c screen12.c screen13.c screen14.c task1.c task2.c task3.c \
     task4.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp09.scn sp09.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp09.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -30,18 +29,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp09.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp09.scn: sp09.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp09.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp09.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp11/Makefile.am b/testsuites/sptests/sp11/Makefile.am
index 53768a8c8f..7cad772f99 100644
--- a/testsuites/sptests/sp11/Makefile.am
+++ b/testsuites/sptests/sp11/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp11
 
 MANAGERS = io event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c timer.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp11.scn sp11.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp11.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp11.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp11.scn: sp11.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp11.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp11.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp12/Makefile.am b/testsuites/sptests/sp12/Makefile.am
index d33177c1cb..f0778d518b 100644
--- a/testsuites/sptests/sp12/Makefile.am
+++ b/testsuites/sptests/sp12/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-TEST = sp12
 
 MANAGERS = io semaphore
 
@@ -10,12 +9,12 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c \
     pritask.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp12.scn sp12.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp12.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -27,18 +26,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp12.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp12.scn: sp12.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp12.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp12.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp13/Makefile.am b/testsuites/sptests/sp13/Makefile.am
index 127a2e0e21..27ab398d5a 100644
--- a/testsuites/sptests/sp13/Makefile.am
+++ b/testsuites/sptests/sp13/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp13
 
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp13.scn sp13.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp13.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp13.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp13.scn: sp13.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp13.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp13.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp14/Makefile.am b/testsuites/sptests/sp14/Makefile.am
index 1fa4fbf43c..0390d98729 100644
--- a/testsuites/sptests/sp14/Makefile.am
+++ b/testsuites/sptests/sp14/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp14
 
 MANAGERS = io signal timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c asr.c task1.c task2.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp14.scn sp14.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp14.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp14.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp14.scn: sp14.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp14.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp14.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp15/Makefile.am b/testsuites/sptests/sp15/Makefile.am
index 539fbd0b91..b6b186ae42 100644
--- a/testsuites/sptests/sp15/Makefile.am
+++ b/testsuites/sptests/sp15/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp15
 
 MANAGERS = io partition
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp15.scn sp15.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp15.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp15.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp15.scn: sp15.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp15.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp15.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp16/Makefile.am b/testsuites/sptests/sp16/Makefile.am
index 4ad64d3aa2..0bd80dee18 100644
--- a/testsuites/sptests/sp16/Makefile.am
+++ b/testsuites/sptests/sp16/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp16
 
 MANAGERS = io region
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp16.scn sp16.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp16.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp16.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp16.scn: sp16.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp16.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp16.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp17/Makefile.am b/testsuites/sptests/sp17/Makefile.am
index 1352864126..efb92b4e89 100644
--- a/testsuites/sptests/sp17/Makefile.am
+++ b/testsuites/sptests/sp17/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp17
 
 MANAGERS = io signal
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c asr.c task1.c task2.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp17.scn sp17.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp17.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp17.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp17.scn: sp17.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp17.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp17.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp19/Makefile.am b/testsuites/sptests/sp19/Makefile.am
index cb124500ed..512a38c410 100644
--- a/testsuites/sptests/sp19/Makefile.am
+++ b/testsuites/sptests/sp19/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp19
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c first.c fptask.c task1.c system.h fptest.h inttest.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp19.scn sp19.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp19.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp19.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp19.scn: sp19.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp19.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp19.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp20/Makefile.am b/testsuites/sptests/sp20/Makefile.am
index bb4064afeb..cf32dab8f8 100644
--- a/testsuites/sptests/sp20/Makefile.am
+++ b/testsuites/sptests/sp20/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp20
 
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c getall.c task1.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp20.scn sp20.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp20.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp20.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp20.scn: sp20.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp20.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp20.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp21/Makefile.am b/testsuites/sptests/sp21/Makefile.am
index 2b4d5f13a6..162afd1532 100644
--- a/testsuites/sptests/sp21/Makefile.am
+++ b/testsuites/sptests/sp21/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp21
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp21.scn sp21.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp21.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp21.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp21.scn: sp21.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp21.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp21.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp22/Makefile.am b/testsuites/sptests/sp22/Makefile.am
index 216706e3ba..b3824a4e26 100644
--- a/testsuites/sptests/sp22/Makefile.am
+++ b/testsuites/sptests/sp22/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp22
 
 MANAGERS = io timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c prtime.c delay.c task1.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp22.scn sp22.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp22.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp22.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp22.scn: sp22.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp22.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp22.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp23/Makefile.am b/testsuites/sptests/sp23/Makefile.am
index 9ddfdb735c..5f9a0bd60c 100644
--- a/testsuites/sptests/sp23/Makefile.am
+++ b/testsuites/sptests/sp23/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp23
 
 MANAGERS = io dual_ported_memory
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp23.scn sp23.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp23.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp23.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp23.scn: sp23.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp23.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp23.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp24/Makefile.am b/testsuites/sptests/sp24/Makefile.am
index 3be6a3316f..855215714b 100644
--- a/testsuites/sptests/sp24/Makefile.am
+++ b/testsuites/sptests/sp24/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp24
 
 MANAGERS = io event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c resume.c task1.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp24.scn sp24.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp24.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp24.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp24.scn: sp24.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp24.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp24.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp25/Makefile.am b/testsuites/sptests/sp25/Makefile.am
index 25a5fc0a7e..e1c365b85f 100644
--- a/testsuites/sptests/sp25/Makefile.am
+++ b/testsuites/sptests/sp25/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp25
 
 MANAGERS = io region
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp25.scn sp25.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp25.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp25.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp25.scn: sp25.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp25.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp25.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp26/Makefile.am b/testsuites/sptests/sp26/Makefile.am
index 80a49094ec..9a9495481c 100644
--- a/testsuites/sptests/sp26/Makefile.am
+++ b/testsuites/sptests/sp26/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp26
 
 MANAGERS = io region event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = sp26.scn sp26.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp26.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp26.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp26.scn: sp26.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp26.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp26.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp27/Makefile.am b/testsuites/sptests/sp27/Makefile.am
index bc385e45fd..f48cce3fd5 100644
--- a/testsuites/sptests/sp27/Makefile.am
+++ b/testsuites/sptests/sp27/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp27
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = sp27.doc sp27.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp27.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp27.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp27.scn: sp27.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp27.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp27.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp28/Makefile.am b/testsuites/sptests/sp28/Makefile.am
index c58c819a5c..4b0300af86 100644
--- a/testsuites/sptests/sp28/Makefile.am
+++ b/testsuites/sptests/sp28/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp28
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = sp28.doc sp28.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp28.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp28.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp28.scn: sp28.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp28.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp28.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp29/Makefile.am b/testsuites/sptests/sp29/Makefile.am
index 3c36f8c12a..ea4553c993 100644
--- a/testsuites/sptests/sp29/Makefile.am
+++ b/testsuites/sptests/sp29/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp29
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = sp29.doc sp29.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp29.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp29.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp29.scn: sp29.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp29.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp29.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp30/Makefile.am b/testsuites/sptests/sp30/Makefile.am
index 621d6fab3c..f9bfb33026 100644
--- a/testsuites/sptests/sp30/Makefile.am
+++ b/testsuites/sptests/sp30/Makefile.am
@@ -2,18 +2,17 @@
 ## $Id$
 ##
 
-TEST = sp30
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c resume.c task1.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = sp30.doc sp30.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp30.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -25,18 +24,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp30.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp30.scn: sp30.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp30.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp30.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp31/Makefile.am b/testsuites/sptests/sp31/Makefile.am
index 4f74d379f7..3901207222 100644
--- a/testsuites/sptests/sp31/Makefile.am
+++ b/testsuites/sptests/sp31/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp31
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = delay.c init.c prtime.c task1.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = sp31.doc sp31.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp31.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp31.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp31.scn: sp31.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp31.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp31.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/sp32/Makefile.am b/testsuites/sptests/sp32/Makefile.am
index 1c3208bd70..95f30eaf73 100644
--- a/testsuites/sptests/sp32/Makefile.am
+++ b/testsuites/sptests/sp32/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = sp32
 
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = $(TEST).scn
+DOCS = sp32.scn
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/sp32.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/sp32.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/sp32.scn: sp32.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/sp32.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp32.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/spfatal/Makefile.am b/testsuites/sptests/spfatal/Makefile.am
index 59817a5ff2..7b9975a278 100644
--- a/testsuites/sptests/spfatal/Makefile.am
+++ b/testsuites/sptests/spfatal/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = spfatal
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c puterr.c fatal.c task1.c system.h
 
-DOCS = $(TEST).scn $(TEST).doc
+DOCS = spfatal.scn spfatal.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/spfatal.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,18 +25,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/spfatal.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/spfatal.scn: spfatal.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/spfatal.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/spfatal.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/sptests/spsize/Makefile.am b/testsuites/sptests/spsize/Makefile.am
index e39c56ccf9..e39972f174 100644
--- a/testsuites/sptests/spsize/Makefile.am
+++ b/testsuites/sptests/spsize/Makefile.am
@@ -2,18 +2,17 @@
 ## $Id$
 ##
 
-TEST = spsize
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c getint.c size.c system.h
 
-DOCS = $(TEST).scn
+DOCS = spsize.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/spsize.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -25,18 +24,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/spsize.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/sptests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
 	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/sptests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+$(project_bspdir)/tests/screens/sptests/spsize.scn: spsize.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+TMPINSTALL_FILES = $(project_bspdir)/tests/spsize.exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/spsize.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmitrontests/tmitronsem01/Makefile.am b/testsuites/tmitrontests/tmitronsem01/Makefile.am
index 0ce3a19414..a3f4874c1a 100644
--- a/testsuites/tmitrontests/tmitronsem01/Makefile.am
+++ b/testsuites/tmitrontests/tmitronsem01/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tmitronsem01
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc
+DOCS = tmitronsem01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tmitronsem01.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tmitronsem01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tmitronsem01.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm01/Makefile.am b/testsuites/tmtests/tm01/Makefile.am
index 064eec846a..2bd10d7cc4 100644
--- a/testsuites/tmtests/tm01/Makefile.am
+++ b/testsuites/tmtests/tm01/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm01
 
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm01.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm01.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm02/Makefile.am b/testsuites/tmtests/tm02/Makefile.am
index 6c5eab356b..b68f9d39ed 100644
--- a/testsuites/tmtests/tm02/Makefile.am
+++ b/testsuites/tmtests/tm02/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm02
 
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm02.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm02.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm02.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm02.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm03/Makefile.am b/testsuites/tmtests/tm03/Makefile.am
index 9138bde56d..a6bf29056a 100644
--- a/testsuites/tmtests/tm03/Makefile.am
+++ b/testsuites/tmtests/tm03/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm03
 
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm03.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm03.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm03.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm03.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm04/Makefile.am b/testsuites/tmtests/tm04/Makefile.am
index 73fa0f3a39..712d05ea50 100644
--- a/testsuites/tmtests/tm04/Makefile.am
+++ b/testsuites/tmtests/tm04/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm04
 
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm04.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm04.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm04.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm04.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm05/Makefile.am b/testsuites/tmtests/tm05/Makefile.am
index 1fc452465c..a68f5538e3 100644
--- a/testsuites/tmtests/tm05/Makefile.am
+++ b/testsuites/tmtests/tm05/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm05
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm05.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm05.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm05.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm05.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm06/Makefile.am b/testsuites/tmtests/tm06/Makefile.am
index ced225a3cd..69fa92fcf6 100644
--- a/testsuites/tmtests/tm06/Makefile.am
+++ b/testsuites/tmtests/tm06/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm06
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm06.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm06.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm06.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm06.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm07/Makefile.am b/testsuites/tmtests/tm07/Makefile.am
index 66044e51de..775a4834bc 100644
--- a/testsuites/tmtests/tm07/Makefile.am
+++ b/testsuites/tmtests/tm07/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm07
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm07.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm07.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm07.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm07.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm08/Makefile.am b/testsuites/tmtests/tm08/Makefile.am
index ecf5434c26..121352e8c0 100644
--- a/testsuites/tmtests/tm08/Makefile.am
+++ b/testsuites/tmtests/tm08/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm08
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm08.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm08.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm08.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm08.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm09/Makefile.am b/testsuites/tmtests/tm09/Makefile.am
index 64f5bbfafa..793ae385a9 100644
--- a/testsuites/tmtests/tm09/Makefile.am
+++ b/testsuites/tmtests/tm09/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm09
 
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm09.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm09.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm09.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm09.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm10/Makefile.am b/testsuites/tmtests/tm10/Makefile.am
index 1d39da5e99..c18a3cc94b 100644
--- a/testsuites/tmtests/tm10/Makefile.am
+++ b/testsuites/tmtests/tm10/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm10
 
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm10.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm10.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm10.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm10.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm11/Makefile.am b/testsuites/tmtests/tm11/Makefile.am
index 57375521b0..4109e28f1c 100644
--- a/testsuites/tmtests/tm11/Makefile.am
+++ b/testsuites/tmtests/tm11/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm11
 
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm11.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm11.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm11.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm11.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm12/Makefile.am b/testsuites/tmtests/tm12/Makefile.am
index 939d9a838c..600caf5c1e 100644
--- a/testsuites/tmtests/tm12/Makefile.am
+++ b/testsuites/tmtests/tm12/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm12
 
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm12.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm12.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm12.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm12.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm13/Makefile.am b/testsuites/tmtests/tm13/Makefile.am
index 6468abae94..29b39eb78a 100644
--- a/testsuites/tmtests/tm13/Makefile.am
+++ b/testsuites/tmtests/tm13/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm13
 
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm13.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm13.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm13.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm13.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm14/Makefile.am b/testsuites/tmtests/tm14/Makefile.am
index 360abd7858..b4eb12fe9c 100644
--- a/testsuites/tmtests/tm14/Makefile.am
+++ b/testsuites/tmtests/tm14/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm14
 
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm14.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm14.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm14.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm14.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm15/Makefile.am b/testsuites/tmtests/tm15/Makefile.am
index 984e1f8a5b..12bf0043a9 100644
--- a/testsuites/tmtests/tm15/Makefile.am
+++ b/testsuites/tmtests/tm15/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm15
 
 MANAGERS = io event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm15.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm15.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm15.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm15.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm16/Makefile.am b/testsuites/tmtests/tm16/Makefile.am
index 578d1153f2..7d691f8391 100644
--- a/testsuites/tmtests/tm16/Makefile.am
+++ b/testsuites/tmtests/tm16/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm16
 
 MANAGERS = io event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm16.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm16.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm16.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm16.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm17/Makefile.am b/testsuites/tmtests/tm17/Makefile.am
index 33e7b11358..b0d7996be2 100644
--- a/testsuites/tmtests/tm17/Makefile.am
+++ b/testsuites/tmtests/tm17/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm17
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm17.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm17.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm17.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm17.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm18/Makefile.am b/testsuites/tmtests/tm18/Makefile.am
index 9dcb927196..de0d417636 100644
--- a/testsuites/tmtests/tm18/Makefile.am
+++ b/testsuites/tmtests/tm18/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm18
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm18.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm18.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm18.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm18.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm19/Makefile.am b/testsuites/tmtests/tm19/Makefile.am
index 0a16d7af72..5adb44fed3 100644
--- a/testsuites/tmtests/tm19/Makefile.am
+++ b/testsuites/tmtests/tm19/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm19
 
 MANAGERS = io signal
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm19.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm19.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm19.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm19.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm20/Makefile.am b/testsuites/tmtests/tm20/Makefile.am
index ee5d5ec76f..e74849be42 100644
--- a/testsuites/tmtests/tm20/Makefile.am
+++ b/testsuites/tmtests/tm20/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm20
 
 MANAGERS = io partition region
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm20.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm20.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm20.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm20.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm21/Makefile.am b/testsuites/tmtests/tm21/Makefile.am
index 791f3fb0c5..c19e6a6082 100644
--- a/testsuites/tmtests/tm21/Makefile.am
+++ b/testsuites/tmtests/tm21/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm21
 
 MANAGERS = io dpmem message partition region semaphore rate_monotonic timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm21.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm21.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm21.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm21.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm22/Makefile.am b/testsuites/tmtests/tm22/Makefile.am
index 3acf5d2051..de7b6ac4a8 100644
--- a/testsuites/tmtests/tm22/Makefile.am
+++ b/testsuites/tmtests/tm22/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm22
 
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm22.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm22.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm22.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm22.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm23/Makefile.am b/testsuites/tmtests/tm23/Makefile.am
index 7cbe36727e..aebb89806f 100644
--- a/testsuites/tmtests/tm23/Makefile.am
+++ b/testsuites/tmtests/tm23/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm23
 
 MANAGERS = io event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm23.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm23.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm23.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm23.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm24/Makefile.am b/testsuites/tmtests/tm24/Makefile.am
index 42ed9a965a..3699ebe82f 100644
--- a/testsuites/tmtests/tm24/Makefile.am
+++ b/testsuites/tmtests/tm24/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm24
 
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm24.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm24.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm24.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm24.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm25/Makefile.am b/testsuites/tmtests/tm25/Makefile.am
index 047f3a1656..0e9fce270b 100644
--- a/testsuites/tmtests/tm25/Makefile.am
+++ b/testsuites/tmtests/tm25/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm25
 
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm25.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm25.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm25.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm25.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm26/Makefile.am b/testsuites/tmtests/tm26/Makefile.am
index b5d66d83e2..19e27151d4 100644
--- a/testsuites/tmtests/tm26/Makefile.am
+++ b/testsuites/tmtests/tm26/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm26
 
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h fptest.h ../include/timesys.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm26.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm26.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm26.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm26.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm27/Makefile.am b/testsuites/tmtests/tm27/Makefile.am
index 16bf1950b0..8a1194cdee 100644
--- a/testsuites/tmtests/tm27/Makefile.am
+++ b/testsuites/tmtests/tm27/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm27
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm27.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm27.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm27.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm27.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm28/Makefile.am b/testsuites/tmtests/tm28/Makefile.am
index e047c6df7a..893c9b2b11 100644
--- a/testsuites/tmtests/tm28/Makefile.am
+++ b/testsuites/tmtests/tm28/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm28
 
 MANAGERS = io dpmem
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm28.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm28.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm28.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm28.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tm29/Makefile.am b/testsuites/tmtests/tm29/Makefile.am
index af01c2084a..c91015c3b6 100644
--- a/testsuites/tmtests/tm29/Makefile.am
+++ b/testsuites/tmtests/tm29/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tm29
 
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tm29.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tm29.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tm29.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tm29.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tmck/Makefile.am b/testsuites/tmtests/tmck/Makefile.am
index a90c9f05db..d611722cbb 100644
--- a/testsuites/tmtests/tmck/Makefile.am
+++ b/testsuites/tmtests/tmck/Makefile.am
@@ -2,19 +2,18 @@
 ## $Id$
 ##
 
-TEST = tmck
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tmck.doc
 
 OBJS = $(lib_a_OBJECTS)
 
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tmck.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -26,10 +25,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tmck.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tmck.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/tmtests/tmoverhd/Makefile.am b/testsuites/tmtests/tmoverhd/Makefile.am
index 0db6b259cd..6b72c5fe5d 100644
--- a/testsuites/tmtests/tmoverhd/Makefile.am
+++ b/testsuites/tmtests/tmoverhd/Makefile.am
@@ -2,18 +2,17 @@
 ## $Id$
 ##
 
-TEST = tmoverhd
 
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = testtask.c empty.c system.h dumrtems.h ../include/timesys.h
 
-DOCS = $(TEST).doc
+DOCS = tmoverhd.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/tmoverhd.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
@@ -25,10 +24,10 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/tmoverhd.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/tmoverhd.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
author	Ralf Corsepius <ralf.corsepius@rtems.org>	2005-11-11 09:03:24 +0000
committer	Ralf Corsepius <ralf.corsepius@rtems.org>	2005-11-11 09:03:24 +0000
commit	7e3887773ab0c62e82e34e2fac42f5e1acf66794 (patch)
tree	7e3d5559fef65afc77f5ef1a95c2694b46cbde72 /testsuites
parent	JOEL, this file is dead. Don't re-add it. (diff)
download	rtems-7e3887773ab0c62e82e34e2fac42f5e1acf66794.tar.bz2