diff --git a/tests/libtest/first.c b/tests/libtest/first.c
index fda1a7fb590b21bc5519b4a6d0c415b744a02eed..8050537db7fa0dc4eb774f47fbc7373f1d434204 100644
--- a/tests/libtest/first.c
+++ b/tests/libtest/first.c
@@ -12,7 +12,7 @@ int test(char *url);
 int select_test (int num_fds, fd_set *rd, fd_set *wr, fd_set *exc,
                  struct timeval *tv)
 {
-#ifdef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__)
   /* Winsock doesn't like no socket set in 'rd', 'wr' or 'exc'. This is
    * case when 'num_fds <= 0. So sleep.
    */
diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c
index 1c858ee35554a03e29a6acb3e8a50513297b3761..d0c2007742ea2dff910ca22363888ad22351cc9f 100644
--- a/tests/libtest/lib518.c
+++ b/tests/libtest/lib518.c
@@ -32,7 +32,7 @@
 #define NUM_OPEN (FD_SETSIZE + 10)
 #define NUM_NEEDED (NUM_OPEN + 16)
 
-#if defined(WIN32) || defined(_WIN32) || defined(MSDOS)
+#if (defined(WIN32) || defined(_WIN32) || defined(MSDOS)) && !defined(__CYGWIN__)
 #define DEV_NULL "NUL"
 #else
 #define DEV_NULL "/dev/null"
diff --git a/tests/server/resolve.c b/tests/server/resolve.c
index 26486f2c5144c6f55551e6863ddc5b61bb5b426f..98a3f4e0802806879e3b4f24ee4225866df6688d 100644
--- a/tests/server/resolve.c
+++ b/tests/server/resolve.c
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
     return 0;
   }
 
-#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#if defined(WIN32) && !defined(__CYGWIN__)
   win32_init();
   atexit(win32_cleanup);
 #endif
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 2e12a03d71c8a1b4de8dad4d9f2dfe761e47d26d..165ecf27a0a5cb506ae3da62214f3e9e53423174 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -552,7 +552,7 @@ int main(int argc, char *argv[])
     }
   }
 
-#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#if defined(WIN32) && !defined(__CYGWIN__)
   win32_init();
   atexit(win32_cleanup);
 #else
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 525163f584cd069f40a9d205e3e09cb995e21788..c2c681dfe94f99e175eb49f623fb094c0f1e962a 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -773,7 +773,7 @@ int main(int argc, char *argv[])
     }
   }
 
-#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#if defined(WIN32) && !defined(__CYGWIN__)
   win32_init();
   atexit(win32_cleanup);
 #else
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index 2cb45b92391df9c411e8a019baaa29da445abc0a..5c3caf4f852b6f10b922665c1748c9575707c15c 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -458,7 +458,7 @@ int main(int argc, char **argv)
     }
   }
 
-#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#if defined(WIN32) && !defined(__CYGWIN__)
   win32_init();
   atexit(win32_cleanup);
 #endif
diff --git a/tests/server/util.c b/tests/server/util.c
index 7cecfe744ccb9b91bb43bd5c29d70ca97bb53a1b..c8faebbb5daab87d8c0d7f4b98bcc7ac3690d39e 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -61,7 +61,7 @@
  */
 int ourerrno(void)
 {
-#ifdef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__)
   return (int)GetLastError();
 #else
   return errno;