diff --git a/tests/ChangeLog b/tests/ChangeLog
index 59a9c5d7..f2d70523 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-25  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpg/t-encrypt-sym.c (main): Change type of I to size_t and
+	rename to LEN.
+	* gpg/t-verify.c (main): Likewise.  Submitted by Stéphane
+	Corthésy.
+
 2002-07-03  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpg/t-eventloop.c: New file.
diff --git a/tests/gpg/t-encrypt-sym.c b/tests/gpg/t-encrypt-sym.c
index 6c765b84..441f747f 100644
--- a/tests/gpg/t-encrypt-sym.c
+++ b/tests/gpg/t-encrypt-sym.c
@@ -77,7 +77,7 @@ main (int argc, char **argv)
   const char *text = "Hallo Leute\n";
   char *text2;
   char *p;
-  int i;
+  size_t len;
 
   err = gpgme_check_engine ();
   fail_if_err (err);
@@ -120,8 +120,8 @@ main (int argc, char **argv)
       print_data (plain);
       fputs ("End Result.\n", stdout);
 
-      text2 = gpgme_data_release_and_get_mem (plain, &i);
-      if (strncmp (text, text2, i))
+      text2 = gpgme_data_release_and_get_mem (plain, &len);
+      if (strncmp (text, text2, len))
 	{
 	  fprintf (stderr, "%s:%d: Wrong plaintext\n", __FILE__, __LINE__);
 	  exit (1);
diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
index 35d95581..13eca934 100644
--- a/tests/gpg/t-verify.c
+++ b/tests/gpg/t-verify.c
@@ -169,7 +169,8 @@ main (int argc, char **argv )
     GpgmeSigStat status;
     char *nota;
     int n = 0;
-    int i, j;
+    size_t len;
+    int j;
 
     err = gpgme_new (&ctx);
     fail_if_err (err);
@@ -227,8 +228,8 @@ main (int argc, char **argv )
     err = gpgme_op_verify (ctx, sig, text, &status);
     fail_if_err (err);
 
-    nota = gpgme_data_release_and_get_mem (text, &i);
-    for (j = 0; j < i; j++)
+    nota = gpgme_data_release_and_get_mem (text, &len);
+    for (j = 0; j < len; j++)
       putchar (nota[j]);
     if (strncmp (nota, test_text1, strlen (test_text1)))
       {