Eliminate TEST.

32 files changed, 192 insertions, 224 deletions

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)