diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 90647811e1..bbcffc6f4b 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-02	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* spchain/init.c, spchain/spchain.scn: Clean up test.
+
 2009-07-01	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* Makefile.am, configure.ac: Add new test to cover bodies of some chain
diff --git a/testsuites/sptests/spchain/init.c b/testsuites/sptests/spchain/init.c
index e8ebfde9dd..14f635af1a 100644
--- a/testsuites/sptests/spchain/init.c
+++ b/testsuites/sptests/spchain/init.c
@@ -52,7 +52,7 @@ rtems_task Init(
      }
   }
 
-  puts( "*** TEST OF RTEMS CHAIN API ***" );
+  puts( "*** END OF RTEMS CHAIN API TEST ***" );
   rtems_test_exit(0);
 }
 
@@ -61,27 +61,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
-/*
- *  In this application, the initialization task performs the system
- *  initialization and then transforms itself into the idle task.
- */
-#define CONFIGURE_IDLE_TASK_BODY Init
-#define CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION
-
-/*
- *  Another odd case to hit.  Since we use the Init task is Idle task
- *  configuration, we can dummy up the initialization task configuration
- *  to have a non-NULL pointer and 0 tasks.
- */
-
-#define CONFIGURE_HAS_OWN_INIT_TASK_TABLE 1
-
-rtems_initialization_tasks_table Initialization_tasks[1] =
-{ { 0, }};
-
-#define CONFIGURE_INIT_TASK_TABLE      Initialization_tasks
-#define CONFIGURE_INIT_TASK_TABLE_SIZE 0
-#define CONFIGURE_INIT_TASK_STACK_SIZE 0
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+#define CONFIGURE_MAXIMUM_TASKS 1
 
 #define CONFIGURE_INIT
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/spchain/spchain.scn b/testsuites/sptests/spchain/spchain.scn
index 89c675f67b..155f755a80 100644
--- a/testsuites/sptests/spchain/spchain.scn
+++ b/testsuites/sptests/spchain/spchain.scn
@@ -1,4 +1,4 @@
 *** TEST OF RTEMS CHAIN API ***
 Init - Initialize chain empty
 INIT - Verify rtems_chain_insert
-*** TEST OF RTEMS CHAIN API ***
+*** END OF RTEMS CHAIN API TEST ***