diff --git a/glib/tests/array-test.c b/glib/tests/array-test.c
index 745cf8b6a..8fd76693b 100644
--- a/glib/tests/array-test.c
+++ b/glib/tests/array-test.c
@@ -366,7 +366,7 @@ array_remove_index (gconstpointer test_data)
 {
   const ArrayTestData *config = test_data;
   GArray *garray;
-  gint i;
+  guint i;
   gint prev, cur;
 
   garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
@@ -403,7 +403,7 @@ array_remove_index_fast (gconstpointer test_data)
 {
   const ArrayTestData *config = test_data;
   GArray *garray;
-  gint i;
+  guint i;
   gint prev, cur;
 
   garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
@@ -443,7 +443,7 @@ array_remove_range (gconstpointer test_data)
 {
   const ArrayTestData *config = test_data;
   GArray *garray;
-  gint i;
+  guint i;
   gint prev, cur;
 
   garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
@@ -586,7 +586,7 @@ array_sort (gconstpointer test_data)
 {
   const ArrayTestData *config = test_data;
   GArray *garray;
-  gint i;
+  guint i;
   gint prev, cur;
 
   garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
@@ -618,7 +618,7 @@ array_sort_with_data (gconstpointer test_data)
 {
   const ArrayTestData *config = test_data;
   GArray *garray;
-  gint i;
+  guint i;
   gint prev, cur;
 
   garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
@@ -1859,7 +1859,7 @@ static void
 byte_array_sort (void)
 {
   GByteArray *gbarray;
-  gint i;
+  guint i;
   guint8 val;
   guint8 prev, cur;
 
@@ -1887,7 +1887,7 @@ static void
 byte_array_sort_with_data (void)
 {
   GByteArray *gbarray;
-  gint i;
+  guint i;
   guint8 val;
   guint8 prev, cur;
 
diff --git a/glib/tests/base64.c b/glib/tests/base64.c
index bb9d4db72..bf32ac629 100644
--- a/glib/tests/base64.c
+++ b/glib/tests/base64.c
@@ -9,7 +9,7 @@ static guchar data[DATA_SIZE];
 
 static void
 test_incremental (gboolean line_break,
-                  gint     length)
+                  gsize    length)
 {
   char *p;
   gsize len, decoded_len, max, input_len, block_size;
diff --git a/glib/tests/checksum.c b/glib/tests/checksum.c
index 5f32f858e..cc78d1170 100644
--- a/glib/tests/checksum.c
+++ b/glib/tests/checksum.c
@@ -1014,9 +1014,8 @@ hexval (const gchar c)
 static guint8 *
 sum_to_digest (const gchar *sum, gsize *len)
 {
-  gsize l;
+  gsize i, l;
   guint8 *digest;
-  gint i;
 
   g_assert (strlen (sum) % 2 == 0);
   l = strlen (sum) / 2;
@@ -1074,7 +1073,7 @@ static void
 test_checksum_string (gconstpointer d)
 {
   const ChecksumComputeTest *test = d;
-  int length;
+  gsize length;
   gchar *checksum;
 
   for (length = 0; length <= FIXED_LEN; length++)
@@ -1098,7 +1097,7 @@ test_checksum_bytes (gconstpointer d)
 {
   const ChecksumComputeTest *test = d;
   GBytes *input;
-  int length;
+  gsize length;
   gchar *checksum;
 
   for (length = 0; length <= FIXED_LEN; length++)
@@ -1179,7 +1178,7 @@ test_unsupported (void)
 int
 main (int argc, char *argv[])
 {
-  int length;
+  gsize length;
 
   g_test_init (&argc, &argv, NULL);
 
diff --git a/glib/tests/convert.c b/glib/tests/convert.c
index c43b3db6e..de6c8a73a 100644
--- a/glib/tests/convert.c
+++ b/glib/tests/convert.c
@@ -138,7 +138,7 @@ test_byte_order (void)
 
 static void
 check_utf8_to_ucs4 (const char     *utf8,
-		    glong           utf8_len,
+		    gsize           utf8_len,
 		    const gunichar *ucs4,
 		    glong           ucs4_len,
 		    glong           error_pos)
@@ -292,7 +292,7 @@ check_ucs4_to_utf8 (const gunichar *ucs4,
 
 static void
 check_utf8_to_utf16 (const char      *utf8,
-		     glong            utf8_len,
+		     gsize            utf8_len,
 		     const gunichar2 *utf16,
 		     glong            utf16_len,
 		     glong            error_pos)
diff --git a/glib/tests/fileutils.c b/glib/tests/fileutils.c
index 4baedf6f9..fa6fc6acf 100644
--- a/glib/tests/fileutils.c
+++ b/glib/tests/fileutils.c
@@ -976,7 +976,7 @@ test_set_contents_full (void)
       gboolean use_strlen;
 
       gboolean expected_success;
-      GFileError expected_error;
+      gint expected_error;
     }
   tests[] =
     {