diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 563c5bb4..a5e0f076 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -1568,6 +1568,8 @@ MHD_cleanup_connections (struct MHD_Daemon *daemon)
 			(struct sockaddr *) pos->addr, 
 			pos->addr_len);
 #if EPOLL_SUPPORT
+      if (0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL))
+	MHD_PANIC ("Internal error");
       if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) &&
 	   (-1 != daemon->epoll_fd) &&
 	   (0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EPOLL_SET)) )
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c
index 32f34ec0..33cf5e42 100644
--- a/src/testcurl/https/test_https_get_parallel.c
+++ b/src/testcurl/https/test_https_get_parallel.c
@@ -141,7 +141,7 @@ main (int argc, char *const *argv)
 
   if (curl_uses_nss_ssl() == 0)
     aes256_sha = "rsa_aes_256_sha";    
-#if LINUX
+#if EPOLL_SUPPORT
   errorCount +=
     test_wrap ("single threaded daemon, single client, epoll", &test_single_client,
                NULL,
@@ -157,7 +157,7 @@ main (int argc, char *const *argv)
                aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);
-#if LINUX
+#if EPOLL_SUPPORT
   errorCount +=
     test_wrap ("single threaded daemon, parallel clients, epoll",
                &test_parallel_clients, NULL,
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c
index 0dd4e11d..70a16425 100644
--- a/src/testcurl/https/test_https_get_select.c
+++ b/src/testcurl/https/test_https_get_select.c
@@ -221,7 +221,7 @@ main (int argc, char *const *argv)
       fprintf (stderr, "Error: %s\n", strerror (errno));
       return -1;
     }
-#if LINUX
+#if EPOLL_SUPPORT
   if (0 != (errorCount = testExternalGet (MHD_USE_EPOLL_LINUX_ONLY)))
     fprintf (stderr, "Fail: %d\n", errorCount);
 #endif