diff --git a/tests/ChangeLog b/tests/ChangeLog
index 2313453d..99a0a459 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,13 @@
+2003-07-31  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpg/t-verify.c (check_result): Change type of SUMMARY to
+	unsigned int.
+	* gpg/t-decrypt-verify.c (check_verify_result): Likewise.
+	* gpg/t-keylist-sig.c (keys): Change type of member CLASS to
+	unsigned int.
+	* t-data.c (read_cb): Change type of AMOUNT to unsigned int.
+	* t-version.c (version): Remove unused variable.
+
 2003-07-22  Marcus Brinkmann  <marcus@g10code.de>
 
 	* Makefile.am (AM_CPPFLAGS): New variable.
diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c
index 9f45fffd..a9c04afb 100644
--- a/tests/gpg/t-decrypt-verify.c
+++ b/tests/gpg/t-decrypt-verify.c
@@ -30,8 +30,8 @@
 
 
 static void
-check_verify_result (gpgme_verify_result_t result, int summary, char *fpr,
-		     gpgme_error_t status)
+check_verify_result (gpgme_verify_result_t result, unsigned int summary,
+		     char *fpr, gpgme_error_t status)
 {
   gpgme_signature_t sig;
 
diff --git a/tests/gpg/t-keylist-sig.c b/tests/gpg/t-keylist-sig.c
index 1a897686..88549d26 100644
--- a/tests/gpg/t-keylist-sig.c
+++ b/tests/gpg/t-keylist-sig.c
@@ -43,7 +43,7 @@ struct
       char *name;
       char *comment;
       char *email;
-      int class;
+      unsigned int class;
       int exportable;
     } sig;
   } uid[3];  
diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
index 74d333f4..b4912e3f 100644
--- a/tests/gpg/t-verify.c
+++ b/tests/gpg/t-verify.c
@@ -71,7 +71,7 @@ static const char test_sig2[] =
 
 
 static void
-check_result (gpgme_verify_result_t result, int summary, char *fpr,
+check_result (gpgme_verify_result_t result, unsigned int summary, char *fpr,
 	      gpgme_error_t status, int notation)
 {
   gpgme_signature_t sig;
diff --git a/tests/t-data.c b/tests/t-data.c
index 882ffc82..d7950ad2 100644
--- a/tests/t-data.c
+++ b/tests/t-data.c
@@ -77,7 +77,7 @@ int
 read_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
 {
   static int off = 0;
-  int amount = strlen (text) - off;
+  unsigned int amount = strlen (text) - off;
   /*  round_t round = *((round_t *) cb_value);  */
 
   if (!buffer && !count && !nread)
diff --git a/tests/t-version.c b/tests/t-version.c
index 04cb1743..5778b6bd 100644
--- a/tests/t-version.c
+++ b/tests/t-version.c
@@ -26,8 +26,6 @@
 
 #include <gpgme.h>
 
-static const char version[] = VERSION;
-
 int 
 main (int argc, char **argv)
 {