diff --git a/src/testcurl/https/test_https_multi_daemon.c b/src/testcurl/https/test_https_multi_daemon.c
index 4713f1ea..54efcabb 100644
--- a/src/testcurl/https/test_https_multi_daemon.c
+++ b/src/testcurl/https/test_https_multi_daemon.c
@@ -119,6 +119,9 @@ main (int argc, char *const *argv)
 
   curl_global_cleanup ();
   fclose (cert);
-  remove (ca_cert_file_name);
+  if (0 != remove (ca_cert_file_name))
+    fprintf (stderr,
+	     "Failed to remove `%s'\n",
+	     ca_cert_file_name);
   return errorCount != 0;
 }
diff --git a/src/testcurl/https/test_tls_authentication.c b/src/testcurl/https/test_tls_authentication.c
index cb80475c..d5a08ffa 100644
--- a/src/testcurl/https/test_tls_authentication.c
+++ b/src/testcurl/https/test_tls_authentication.c
@@ -98,6 +98,9 @@ main (int argc, char *const *argv)
   print_test_result (errorCount, argv[0]);
 
   curl_global_cleanup ();
-  remove (ca_cert_file_name);
+  if (0 != remove (ca_cert_file_name))
+    fprintf (stderr,
+	     "Failed to remove `%s'\n",
+	     ca_cert_file_name);
   return errorCount != 0;
 }
diff --git a/src/testcurl/perf_get_concurrent.c b/src/testcurl/perf_get_concurrent.c
index 15616ad5..b6c9259b 100644
--- a/src/testcurl/perf_get_concurrent.c
+++ b/src/testcurl/perf_get_concurrent.c
@@ -306,7 +306,15 @@ testExternalGet (int port)
       if (MHD_YES != tret) tt = 1;
       tv.tv_sec = tt / 1000;
       tv.tv_usec = 1000 * (tt % 1000);
-      select (max + 1, &rs, &ws, &es, &tv);
+      if (-1 == select (max + 1, &rs, &ws, &es, &tv))
+	{
+	  if (EINTR == errno)
+	    continue;
+	  fprintf (stderr,
+		   "select failed: %s\n",
+		   strerror (errno));
+	  break;	      	  
+	}
       MHD_run (d);
     }
   stop ("external select");
diff --git a/src/testcurl/test_post_loop.c b/src/testcurl/test_post_loop.c
index e19941df..1d4657c6 100644
--- a/src/testcurl/test_post_loop.c
+++ b/src/testcurl/test_post_loop.c
@@ -396,7 +396,15 @@ testExternalPost ()
 	    timeout = 0; /* terminate quickly... */
           tv.tv_sec = timeout / 1000;
           tv.tv_usec = (timeout % 1000) * 1000;
-          select (max + 1, &rs, &ws, &es, &tv);
+          if (-1 == select (max + 1, &rs, &ws, &es, &tv))
+	    {
+	      if (EINTR == errno)
+		continue;
+	      fprintf (stderr,
+		       "select failed: %s\n",
+		       strerror (errno));
+	      break;	      
+	    }
           while (CURLM_CALL_MULTI_PERFORM ==
                  curl_multi_perform (multi, &running));
           if (running == 0)