diff --git a/testsuites/smptests/smp02/init.c b/testsuites/smptests/smp02/init.c
index 15a23a2aa5..c630c49b3f 100644
--- a/testsuites/smptests/smp02/init.c
+++ b/testsuites/smptests/smp02/init.c
@@ -50,7 +50,7 @@ rtems_task Init(
 {
   (void) argument;
 
-  int               i;
+  uint32_t          i;
   char              ch;
   uint32_t          cpu_num;
   rtems_id          id;
diff --git a/testsuites/smptests/smpaffinity01/init.c b/testsuites/smptests/smpaffinity01/init.c
index 82e93895be..83de3e5c05 100644
--- a/testsuites/smptests/smpaffinity01/init.c
+++ b/testsuites/smptests/smpaffinity01/init.c
@@ -119,7 +119,7 @@ void Validate_affinity(void )
   cpu_set_t            cpuset0;
   cpu_set_t            cpuset1;
   cpu_set_t            cpuset2;
-  uint32_t             i;
+  int                  i;
   int                  sc;
   int                  cpu_count;
   rtems_task_priority  priority;
@@ -231,7 +231,7 @@ static void Init(rtems_task_argument arg)
 {
   (void) arg;
 
-  int                  sc;
+  rtems_status_code sc;
 
   TEST_BEGIN();
 
diff --git a/testsuites/smptests/smpcapture01/init.c b/testsuites/smptests/smpcapture01/init.c
index 42d97c28cf..3b34e0d8bd 100644
--- a/testsuites/smptests/smpcapture01/init.c
+++ b/testsuites/smptests/smpcapture01/init.c
@@ -78,7 +78,7 @@ rtems_id           task_sem;
  * Spin loop to allow tasks to delay without yeilding the
  * processor.
  */
-static void test_delay(int ticks)
+static void test_delay(rtems_interval ticks)
 {
   rtems_interval start, stop;
   start = rtems_clock_get_ticks_since_boot();
diff --git a/testsuites/smptests/smppsxaffinity02/init.c b/testsuites/smptests/smppsxaffinity02/init.c
index 3fcc263abb..ca80612c03 100644
--- a/testsuites/smptests/smppsxaffinity02/init.c
+++ b/testsuites/smptests/smppsxaffinity02/init.c
@@ -123,7 +123,7 @@ void Validate_affinity(void )
   cpu_set_t            cpuset0;
   cpu_set_t            cpuset1;
   cpu_set_t            cpuset2;
-  uint32_t             i;
+  int                  i;
   int                  sc;
   int                  cpu_count;
   struct sched_param   param;
diff --git a/testsuites/smptests/smpschedaffinity03/init.c b/testsuites/smptests/smpschedaffinity03/init.c
index fc48c84768..218914de58 100644
--- a/testsuites/smptests/smpschedaffinity03/init.c
+++ b/testsuites/smptests/smpschedaffinity03/init.c
@@ -43,7 +43,7 @@ const char rtems_test_name[] = "SMPSCHEDAFFINITY 3";
 #define NUM_CPUS   4
 #define TASK_COUNT NUM_CPUS
 
-static void test_delay(int ticks)
+static void test_delay(rtems_interval ticks)
 { 
   rtems_interval start, stop;
   start = rtems_clock_get_ticks_since_boot();
diff --git a/testsuites/smptests/smpschedaffinity04/init.c b/testsuites/smptests/smpschedaffinity04/init.c
index b1176e06d2..57a9839c4d 100644
--- a/testsuites/smptests/smpschedaffinity04/init.c
+++ b/testsuites/smptests/smpschedaffinity04/init.c
@@ -58,7 +58,7 @@ rtems_id           task_sem;
 
 static void task(rtems_task_argument arg);
 
-static void test_delay(int ticks)
+static void test_delay(rtems_interval ticks)
 { 
   rtems_interval start, stop;
   start = rtems_clock_get_ticks_since_boot();
@@ -91,8 +91,8 @@ static void test(void)
 {
   rtems_status_code   sc;
   uint32_t            cpu_count;
-  int                 cpu;
-  int                 i;
+  uint32_t            cpu;
+  uint32_t            i;
   cpu_set_t           cpuset;
 
   /* Get the number of processors that we are using. */
diff --git a/testsuites/smptests/smpschedaffinity05/init.c b/testsuites/smptests/smpschedaffinity05/init.c
index eba6552537..b0616fadc8 100644
--- a/testsuites/smptests/smpschedaffinity05/init.c
+++ b/testsuites/smptests/smpschedaffinity05/init.c
@@ -79,7 +79,7 @@ static void verify_tasks(void);
  * Spin loop to allow tasks to delay without yeilding the
  * processor.
  */
-static void test_delay(int ticks)
+static void test_delay(rtems_interval ticks)
 {
   rtems_interval start, stop;
   start = rtems_clock_get_ticks_since_boot();