diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c
index 600ed65e539f35f6e4cb7e967bbc196680f18859..c68e19b6d17bfeeb3d4fbc89c82575bfe78d3bfb 100644
--- a/tests/libtest/lib526.c
+++ b/tests/libtest/lib526.c
@@ -215,7 +215,7 @@ int test(char *URL)
     res = TEST_ERR_RUNS_FOREVER;
   }
 
-test_cleanup:
+/* test_cleanup: */
 
 #ifndef LIB527
   /* get NUM_HANDLES easy handles */
diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index ef2218834f26f9bb2bc011f48112094e9aabca93..3b0bd001c2edc65e7c0428f4763568282efaac2c 100644
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@@ -197,7 +197,7 @@ int test(char *URL)
     res = TEST_ERR_RUNS_FOREVER;
   }
 
-test_cleanup:
+/* test_cleanup: */
 
   /* cleanup NUM_HANDLES easy handles */
   for(i=0; i < NUM_HANDLES; i++) {
diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c
index 0e7e3fea4460917c681b7298174d393c2cd7c080..3443c406a7ac01541720cb156b786ec93cd79bc1 100644
--- a/tests/libtest/lib568.c
+++ b/tests/libtest/lib568.c
@@ -32,7 +32,7 @@ static char *suburl(const char *base, int i)
  */
 int test(char *URL)
 {
-  CURLcode res;
+  int res;
   CURL *curl;
   int sdp;
   FILE *sdpf = NULL;
diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c
index d5af4514ec4a222197f6926d12f5e2963255f94e..815ca3a71db232e4a1b3482b64e1de908534611f 100644
--- a/tests/libtest/lib569.c
+++ b/tests/libtest/lib569.c
@@ -25,7 +25,7 @@ static char *suburl(const char *base, int i)
  */
 int test(char *URL)
 {
-  CURLcode res;
+  int res;
   CURL *curl;
   char *stream_uri;
   char *rtsp_session_id;
@@ -60,7 +60,7 @@ int test(char *URL)
 
   test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_SETUP);
   res = curl_easy_perform(curl);
-  if(res != CURLE_BAD_FUNCTION_ARGUMENT) {
+  if(res != (int)CURLE_BAD_FUNCTION_ARGUMENT) {
     fprintf(stderr, "This should have failed. "
             "Cannot setup without a Transport: header");
     res = TEST_ERR_MAJOR_BAD;
@@ -113,6 +113,6 @@ test_cleanup:
   curl_easy_cleanup(curl);
   curl_global_cleanup();
 
-  return (int)res;
+  return res;
 }
 
diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c
index f044f85e2286ca38bccac86333c808e67348b17f..4f40a027653d1539826aa99803ed6620e4bf083e 100644
--- a/tests/libtest/lib570.c
+++ b/tests/libtest/lib570.c
@@ -22,7 +22,7 @@ static char *suburl(const char *base, int i)
 
 int test(char *URL)
 {
-  CURLcode res;
+  int res;
   CURL *curl;
   int request=1;
   char *stream_uri = NULL;
@@ -55,7 +55,7 @@ int test(char *URL)
   stream_uri = NULL;
 
   res = curl_easy_perform(curl);
-  if(res != CURLE_RTSP_CSEQ_ERROR) {
+  if(res != (int)CURLE_RTSP_CSEQ_ERROR) {
     fprintf(stderr, "Failed to detect CSeq mismatch");
     res = TEST_ERR_MAJOR_BAD;
     goto test_cleanup;
@@ -98,6 +98,6 @@ test_cleanup:
   curl_easy_cleanup(curl);
   curl_global_cleanup();
 
-  return (int)res;
+  return res;
 }
 
diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c
index a264eddbd9027392b16049a95fe008c6ae1b34b2..b91a6fa8b844b74aa75cb1551f89cfae5a4c9ecf 100644
--- a/tests/libtest/lib571.c
+++ b/tests/libtest/lib571.c
@@ -89,7 +89,7 @@ static char *suburl(const char *base, int i)
 
 int test(char *URL)
 {
-  CURLcode res;
+  int res;
   CURL *curl;
   char *stream_uri = NULL;
   int request=1;
@@ -189,6 +189,6 @@ test_cleanup:
   curl_easy_cleanup(curl);
   curl_global_cleanup();
 
-  return (int)res;
+  return res;
 }