3 files changed, 9 insertions, 8 deletions
diff --git a/testsuites/tmtests/tm21/Makefile.am b/testsuites/tmtests/tm21/Makefile.am
index a9fc96e91f..da5c5bff60 100644
--- a/testsuites/tmtests/tm21/Makefile.am
+++ b/testsuites/tmtests/tm21/Makefile.am
@@ -1,8 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 TEST = tm21
 
 MANAGERS = io dpmem message partition region semaphore rate_monotonic timer
@@ -11,7 +12,7 @@ C_FILES = task1.c
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
 H_FILES = system.h
-noinst_HEADERS =$(H_FILES)
+noinst_HEADERS = $(H_FILES)
 
 DOCTYPES = doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/tmtests/tm21/system.h b/testsuites/tmtests/tm21/system.h
index e0b56c7e31..1ad2d74306 100644
--- a/testsuites/tmtests/tm21/system.h
+++ b/testsuites/tmtests/tm21/system.h
@@ -26,10 +26,8 @@ rtems_task Init(
 
 /* configuration information */
  
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS              102
 #define CONFIGURE_MAXIMUM_TIMERS             100
diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
index 6b0086eb24..42591316f3 100644
--- a/testsuites/tmtests/tm21/task1.c
+++ b/testsuites/tmtests/tm21/task1.c
@@ -48,6 +48,8 @@ rtems_task Init(
   directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
 }
 
+#define MESSAGE_SIZE (sizeof(long) * 4)
+
 rtems_task Task_1(
   rtems_task_argument argument
 )
@@ -70,7 +72,7 @@ rtems_task Task_1(
     status = rtems_message_queue_create(
       index,
       1,                       /* only going to ident this queue */
-      16,
+      MESSAGE_SIZE,
       RTEMS_DEFAULT_ATTRIBUTES,
       &id
     );