diff --git a/tests/libtest/first.c b/tests/libtest/first.c
index 6b9af9bcf1385c59ddc6fd87397fbf51cec7cc94..d8bfdd19a256a54bbc25d640bd7e438797f7da4e 100644
--- a/tests/libtest/first.c
+++ b/tests/libtest/first.c
@@ -6,7 +6,7 @@ extern void curl_memdebug(const char *);
 #endif
 
 /* test is provided in the test code file */
-CURLcode test(char *url);
+int test(char *url);
 
 char *arg2=NULL;
 
diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c
index 2ed1a9ae4c100194bad17aab9f5f2e8c43758035..b0ff0a73152b0d93ef9097aafb026af039a30669 100644
--- a/tests/libtest/lib501.c
+++ b/tests/libtest/lib501.c
@@ -1,6 +1,6 @@
 #include "test.h"
 
-CURLcode test(char *URL)
+int test(char *URL)
 {
   CURLcode res;
   CURL *curl = curl_easy_init();
diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c
index 55ca6c5db7bd62a673ebabc77bdc62bc922560e3..ac298f0fc7601bc766dc81699fc2a7d90fe4c8e8 100644
--- a/tests/libtest/lib502.c
+++ b/tests/libtest/lib502.c
@@ -4,7 +4,7 @@
  * Get a single URL without select().
  */
 
-CURLcode test(char *URL)
+int test(char *URL)
 {
   CURL *c;
   CURLM *m;
diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c
index f324b35d679b950b330ac8dc18fd83ac910387bf..f74ad3f38e1a6825bb1424e493e39d027afd568f 100644
--- a/tests/libtest/lib503.c
+++ b/tests/libtest/lib503.c
@@ -14,7 +14,7 @@
  * auth info.
  */
 
-CURLcode test(char *URL)
+int test(char *URL)
 {
   CURL *c;
   CURLM *m;
@@ -82,6 +82,6 @@ CURLcode test(char *URL)
   curl_easy_cleanup(c);
   curl_multi_cleanup(m);
 	
-  return 0;
+  return CURLE_OK;
 }
 
diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c
index 0a9aff2cc35ecd583b686764581a5ce2188fac9f..f2a202199b26494c1ed28e4b4fd444e4f4971c7f 100644
--- a/tests/libtest/lib504.c
+++ b/tests/libtest/lib504.c
@@ -13,7 +13,7 @@
  * Use multi interface to get document over proxy with bad port number.
  * This caused the interface to "hang" in libcurl 7.10.2.
  */
-CURLcode test(char *URL)
+int test(char *URL)
 {
   CURL *c;
   CURLcode ret=CURLE_OK;
diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c
index 0efaf76cc1982dc0083c51ccec99dfd643485cff..131df7856c9c8293e6866517be3f545c9e076b22 100644
--- a/tests/libtest/lib505.c
+++ b/tests/libtest/lib505.c
@@ -34,7 +34,7 @@
  * Example based on source code provided by Erick Nuwendam. Thanks!
  */
 
-CURLcode test(char *URL)
+int test(char *URL)
 {
   CURL *curl;
   CURLcode res;
diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index 998c1370ccc9f2341312f6acf8312704d5eb312b..40f72617883b22eb5c72bbd84eec3908a76ff9f3 100644
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@@ -127,7 +127,7 @@ char *suburl(char *base, int i)
 
 
 /* test function */
-CURLcode test(char *URL)
+int test(char *URL)
 {
   CURLcode res;
   CURLSHcode scode;
diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c
index 14004f3d9fe520df8294da66536fd2bb6341e688..f45169496f5814cada7b47bfe1391495a5eb6771 100644
--- a/tests/libtest/lib507.c
+++ b/tests/libtest/lib507.c
@@ -1,6 +1,6 @@
 #include "test.h"
 
-CURLcode test(char *URL)
+int test(char *URL)
 {
   CURL* curls;
   CURLM* multi;
diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c
index e6798da2e558fbf6c1eb1795a138b8b64ad7e272..6a826b7b0d41452416f30f174cbe911fa924b880 100644
--- a/tests/libtest/lib508.c
+++ b/tests/libtest/lib508.c
@@ -24,7 +24,7 @@ static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
   return -1;                         /* no more data left to deliver */
 }
 
-CURLcode test(char *URL)
+int test(char *URL)
 {
   CURL *curl;
   CURLcode res=CURLE_OK;
diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c
index d9774d129ad78b7b03f8739bb0576a48bf5f3929..0f956ebfb4d1019f44ca6898161ffc2aa9cc75eb 100644
--- a/tests/libtest/lib509.c
+++ b/tests/libtest/lib509.c
@@ -159,8 +159,7 @@ static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm)
   return CURLE_OK ;
 }
 
-
-CURLcode test(char *URL)
+int test(char *URL)
 {
   CURLM* multi;
   sslctxparm p;
diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c
index 1cf440bd3b935408e42401832e2616018b50bcef..051a773c53253166fc829e07f4cfc4af56c71b6c 100644
--- a/tests/libtest/lib510.c
+++ b/tests/libtest/lib510.c
@@ -32,7 +32,7 @@ static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
   return 0;                         /* no more data left to deliver */
 }
 
-CURLcode test(char *URL)
+int test(char *URL)
 {
   CURL *curl;
   CURLcode res=CURLE_OK;