diff --git a/testsuites/sptests/sp13/fillbuff.c b/testsuites/sptests/sp13/fillbuff.c
index 5a559af7e4..e5e5834290 100644
--- a/testsuites/sptests/sp13/fillbuff.c
+++ b/testsuites/sptests/sp13/fillbuff.c
@@ -48,7 +48,8 @@ void Fill_buffer(
 )
 {
   char *p;
-  int i, j;
+  size_t i;
+  int j;
 
   p = source;
   for ( i = 0 ; i < MESSAGE_SIZE / sizeof(long) ; i++ ) {
diff --git a/testsuites/sptests/sp2038/init.c b/testsuites/sptests/sp2038/init.c
index 9802cb1865..4a831f87ac 100644
--- a/testsuites/sptests/sp2038/init.c
+++ b/testsuites/sptests/sp2038/init.c
@@ -292,7 +292,7 @@ static void test_every_day(void)
     for (every_day.year = 1988; every_day.year <= 2099; ++every_day.year) {
         int leap_year = test_year_is_leap_year(every_day.year) ? 1 : 0;
         for (every_day.month = 1; every_day.month <= 12; ++every_day.month) {
-            int days = days_per_month[leap_year][every_day.month - 1];
+            uint32_t days = days_per_month[leap_year][every_day.month - 1];
             for (every_day.day = 1; every_day.day <= days; ++every_day.day) {
                 sc = rtems_clock_set(&every_day);
                 ASSERT_SC(sc);
diff --git a/testsuites/sptests/sp29/init.c b/testsuites/sptests/sp29/init.c
index 8e1c2ca0ec..42a3f9205d 100644
--- a/testsuites/sptests/sp29/init.c
+++ b/testsuites/sptests/sp29/init.c
@@ -252,7 +252,7 @@ rtems_task Init (rtems_task_argument ignored)
         __LINE__,
         rtems_status_text (sc)
       );
-    } else if (diff < (int) (2 * ticksPerSecond)) {
+    } else if (diff < (rtems_interval) (2 * ticksPerSecond)) {
       printf(
         "%d: Obtained obtain non-recursive-lock semaphore too quickly -- %"
           PRIdrtems_interval " ticks not %" PRIdrtems_interval " ticks\n",
diff --git a/testsuites/sptests/sp42/init.c b/testsuites/sptests/sp42/init.c
index e83533d5ec..22a6ad1141 100644
--- a/testsuites/sptests/sp42/init.c
+++ b/testsuites/sptests/sp42/init.c
@@ -66,7 +66,7 @@ static const rtems_task_priority Priorities_Low[MAX_TASKS] = {
   12, 12, 12, 12,       /* backward - multple on 2-n chain */
 };
 
-static const int Obtain_order[2][MAX_TASKS] = {
+static const rtems_task_argument Obtain_order[2][MAX_TASKS] = {
   { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 },
   { 4, 5, 6, 7, 9, 10, 11, 12, 13, 8, 16, 17, 18, 19, 0, 1, 2, 3, 15, 14 }
 };
diff --git a/testsuites/sptests/sp63/init.c b/testsuites/sptests/sp63/init.c
index 1ca96d1963..94c98cdf04 100644
--- a/testsuites/sptests/sp63/init.c
+++ b/testsuites/sptests/sp63/init.c
@@ -111,7 +111,8 @@ void test_case_three(void)
 #if 0
   Heap_Resize_status hc;
 #endif
-  int pg, al, alloc, sz;
+  size_t alloc;
+  int pg, al, sz;
 
   puts( "Init - _Heap_Allocate_aligned - request impossible - not OK");
 
diff --git a/testsuites/sptests/sp69/init.c b/testsuites/sptests/sp69/init.c
index e140a7d4aa..e581db4926 100644
--- a/testsuites/sptests/sp69/init.c
+++ b/testsuites/sptests/sp69/init.c
@@ -50,7 +50,7 @@ rtems_task Init(
   rtems_rate_monotonic_period_status      period_status;
   rtems_status_code                       status;
   rtems_rate_monotonic_period_statistics  statistics;
-  int                                     i;
+  uint32_t                                i;
 
   period_name = rtems_build_name('P','E','R','1');
 
diff --git a/testsuites/sptests/sp71/init.c b/testsuites/sptests/sp71/init.c
index 437be3c093..352d5f5635 100644
--- a/testsuites/sptests/sp71/init.c
+++ b/testsuites/sptests/sp71/init.c
@@ -50,7 +50,7 @@ rtems_task Init(
 
   rtems_status_code status;
   rtems_id          id;
-  long              created;
+  size_t            created;
 
   TEST_BEGIN();
 
@@ -70,7 +70,7 @@ rtems_task Init(
   } while (1);
 
   printf(
-    "%ld ports created using %d per allocation -- need %ld\n",
+    "%zu ports created using %d per allocation -- need %ld\n",
     created,
     PER_ALLOCATION,
     (long) OBJECTS_ID_FINAL_INDEX
diff --git a/testsuites/sptests/spcbssched03/tasks_aperiodic.c b/testsuites/sptests/spcbssched03/tasks_aperiodic.c
index e52140099a..249e6ff4e6 100644
--- a/testsuites/sptests/spcbssched03/tasks_aperiodic.c
+++ b/testsuites/sptests/spcbssched03/tasks_aperiodic.c
@@ -36,7 +36,7 @@ rtems_task Tasks_Aperiodic(
 )
 {
   rtems_status_code status;
-  int start, stop, now;
+  rtems_interval start, stop, now;
 
   put_name( Task_name[ argument ], FALSE );
 
diff --git a/testsuites/sptests/spcbssched03/tasks_periodic.c b/testsuites/sptests/spcbssched03/tasks_periodic.c
index d56383414f..193dd5994c 100644
--- a/testsuites/sptests/spcbssched03/tasks_periodic.c
+++ b/testsuites/sptests/spcbssched03/tasks_periodic.c
@@ -59,7 +59,7 @@ rtems_task Tasks_Periodic(
   rtems_status_code status;
   bool              scenario_done = 0;
 
-  int start, stop, now;
+  rtems_interval start, stop, now;
 
   rtems_cbs_server_id server_id, tsid;
   rtems_cbs_parameters params, tparams;
diff --git a/testsuites/sptests/spclock_todhook01/init.c b/testsuites/sptests/spclock_todhook01/init.c
index 87c8673a22..34483c32f4 100644
--- a/testsuites/sptests/spclock_todhook01/init.c
+++ b/testsuites/sptests/spclock_todhook01/init.c
@@ -309,7 +309,7 @@ static rtems_task Init(rtems_task_argument ignored)
   (void) ignored;
 
   // rtems_status_code status;
-  int               i;
+  size_t i;
 
   TEST_BEGIN();
 
diff --git a/testsuites/sptests/spedfsched03/tasks_aperiodic.c b/testsuites/sptests/spedfsched03/tasks_aperiodic.c
index 12d193338b..50407455c3 100644
--- a/testsuites/sptests/spedfsched03/tasks_aperiodic.c
+++ b/testsuites/sptests/spedfsched03/tasks_aperiodic.c
@@ -42,9 +42,9 @@ rtems_task Tasks_Aperiodic(
 )
 {
   rtems_status_code   status;
-  int                 start;
-  int                 stop;
-  int                 now;
+  rtems_interval      start;
+  rtems_interval      stop;
+  rtems_interval      now;
 
   put_name( Task_name[ argument ], FALSE );
 
diff --git a/testsuites/sptests/spedfsched03/tasks_periodic.c b/testsuites/sptests/spedfsched03/tasks_periodic.c
index 65078b4e2c..7387e2c2c6 100644
--- a/testsuites/sptests/spedfsched03/tasks_periodic.c
+++ b/testsuites/sptests/spedfsched03/tasks_periodic.c
@@ -51,7 +51,7 @@ rtems_task Tasks_Periodic(
   rtems_task_priority prio_cur;
   rtems_task_priority prio_max;
 
-  int start, stop, now;
+  rtems_interval start, stop, now;
 
   status = rtems_rate_monotonic_create( argument, &rmid );
   directive_failed( status, "rtems_rate_monotonic_create" );
diff --git a/testsuites/sptests/spthreadq01/init.c b/testsuites/sptests/spthreadq01/init.c
index 73368c3cc7..18f68c129b 100644
--- a/testsuites/sptests/spthreadq01/init.c
+++ b/testsuites/sptests/spthreadq01/init.c
@@ -200,7 +200,7 @@ static void test_posix_init(test_context *ctx)
   attr.mq_msgsize = sizeof(char);
 
   ctx->pmq = mq_open("mq", O_CREAT | O_RDWR, 0x777, &attr);
-  rtems_test_assert(ctx->mq != -1);
+  rtems_test_assert(ctx->pmq != (mqd_t) -1);
 }
 
 static void test_context_init(test_context *ctx)
diff --git a/testsuites/sptests/sptls01/init.c b/testsuites/sptests/sptls01/init.c
index ce2da6f7f9..ccd2404b8f 100644
--- a/testsuites/sptests/sptls01/init.c
+++ b/testsuites/sptests/sptls01/init.c
@@ -48,7 +48,7 @@ static volatile uint32_t read_write_small = 0xdeadbeefUL;
 
 static const volatile uint32_t read_only_small = 0x601dc0feUL;
 
-static void check_tls_item(uint32_t expected)
+static void check_tls_item(char expected)
 {
   printk("TLS item = %i\n", tls_item);
   rtems_test_assert(tls_item == expected);