diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index c24c602425..e91da50083 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-03	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* sp54/init.c, sp54/sp54.doc: Add test for Workspace zeroed.
+
 2009-07-03	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* sp54/init.c, sp54/sp54.doc: Fix typos and comments.
diff --git a/testsuites/sptests/sp54/init.c b/testsuites/sptests/sp54/init.c
index b9a32fc61b..419308e424 100644
--- a/testsuites/sptests/sp54/init.c
+++ b/testsuites/sptests/sp54/init.c
@@ -74,6 +74,12 @@ rtems_initialization_tasks_table Initialization_tasks[1] =
 #define CONFIGURE_INIT_TASK_TABLE_SIZE 0
 #define CONFIGURE_INIT_TASK_STACK_SIZE 0
 
+/*
+ *  Ensure we test the case where memory is zero.  Not
+ *  all BSPs will set this to TRUE by default.
+ */
+#define CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY TRUE
+
 #define CONFIGURE_INIT
 #include <rtems/confdefs.h>
 
diff --git a/testsuites/sptests/sp54/sp54.doc b/testsuites/sptests/sp54/sp54.doc
index dfc4139358..504557f328 100644
--- a/testsuites/sptests/sp54/sp54.doc
+++ b/testsuites/sptests/sp54/sp54.doc
@@ -27,3 +27,4 @@ concepts:
 + Verify that when configuring a system which starts with the Idle task
   and uses that as a user task, you can configure your own Classic API
   Initialization Tasks Table and set to 0 tasks.
++ Verify the case where RTEMS zeros the workspace is covered.