3 files changed, 13 insertions, 11 deletions
diff --git a/testsuites/tmtests/tm09/Makefile.am b/testsuites/tmtests/tm09/Makefile.am
index 205a989fec..3770facbfb 100644
--- a/testsuites/tmtests/tm09/Makefile.am
+++ b/testsuites/tmtests/tm09/Makefile.am
@@ -1,8 +1,9 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 TEST = tm09
 
 MANAGERS = io message
@@ -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/tm09/system.h b/testsuites/tmtests/tm09/system.h
index b22856dafc..f5b30a1d04 100644
--- a/testsuites/tmtests/tm09/system.h
+++ b/testsuites/tmtests/tm09/system.h
@@ -26,11 +26,10 @@ 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              2
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
 #define CONFIGURE_TICKS_PER_TIMESLICE        0
  
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
index 27bbc0931e..34ce8b5a11 100644
--- a/testsuites/tmtests/tm09/task1.c
+++ b/testsuites/tmtests/tm09/task1.c
@@ -47,6 +47,8 @@ rtems_task Init(
   directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
 }
 
+#define MESSAGE_SIZE (sizeof(long) * 4)
+
 rtems_task Test_task (
   rtems_task_argument argument
 )
@@ -55,7 +57,7 @@ rtems_task Test_task (
     rtems_message_queue_create(
       1,
       OPERATION_COUNT,
-      16,
+      MESSAGE_SIZE,
       RTEMS_DEFAULT_ATTRIBUTES,
       &Queue_id
     );
@@ -135,7 +137,7 @@ void queue_test()
 
     Timer_initialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) rtems_message_queue_send( Queue_id, (long (*)[4])buffer, 16 );
+        (void) rtems_message_queue_send( Queue_id, buffer, MESSAGE_SIZE );
     send_time += Read_timer();
 
     Timer_initialize();
@@ -151,7 +153,7 @@ void queue_test()
 
     Timer_initialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) rtems_message_queue_urgent( Queue_id, (long (*)[4])buffer, 16 );
+        (void) rtems_message_queue_urgent( Queue_id, buffer, MESSAGE_SIZE );
     urgent_time += Read_timer();
 
     Timer_initialize();
@@ -173,7 +175,7 @@ void queue_test()
     status = rtems_message_queue_send(
        Queue_id,
        (long (*)[4])buffer,
-       16
+       MESSAGE_SIZE
     );
     directive_failed( status, "rtems_message_queue_send" );