diff --git a/test/test-list.h b/test/test-list.h
index 28a13b2e..1efd9106 100644
--- a/test/test-list.h
+++ b/test/test-list.h
@@ -192,8 +192,6 @@ TEST_DECLARE   (dlerror)
 TEST_DECLARE   (poll_duplex)
 TEST_DECLARE   (poll_unidirectional)
 TEST_DECLARE   (poll_close)
-TEST_DECLARE   (we_get_signal)
-TEST_DECLARE   (we_get_signals)
 #ifdef _WIN32
 TEST_DECLARE   (spawn_detect_pipe_name_collisions_on_windows)
 TEST_DECLARE   (argument_escaping)
@@ -203,6 +201,8 @@ TEST_DECLARE   (listen_no_simultaneous_accepts)
 TEST_DECLARE   (fs_stat_root)
 #else
 TEST_DECLARE   (spawn_setuid_setgid)
+TEST_DECLARE   (we_get_signal)
+TEST_DECLARE   (we_get_signals)
 #endif
 HELPER_DECLARE (tcp4_echo_server)
 HELPER_DECLARE (tcp6_echo_server)
@@ -398,9 +398,6 @@ TASK_LIST_START
   TEST_ENTRY  (fs_poll)
   TEST_ENTRY  (kill)
 
-  TEST_ENTRY  (we_get_signal)
-  TEST_ENTRY  (we_get_signals)
-
 #ifdef _WIN32
   TEST_ENTRY  (spawn_detect_pipe_name_collisions_on_windows)
   TEST_ENTRY  (argument_escaping)
@@ -410,6 +407,8 @@ TASK_LIST_START
   TEST_ENTRY  (fs_stat_root)
 #else
   TEST_ENTRY  (spawn_setuid_setgid)
+  TEST_ENTRY  (we_get_signal)
+  TEST_ENTRY  (we_get_signals)
 #endif
 
   TEST_ENTRY  (fs_file_noent)
diff --git a/test/test-signal.c b/test/test-signal.c
index b39bc244..01301c56 100644
--- a/test/test-signal.c
+++ b/test/test-signal.c
@@ -19,31 +19,19 @@
  * IN THE SOFTWARE.
  */
 
+
+/* This test does not pretend to be cross-platform. */
+#ifndef _WIN32
+
 #include "uv.h"
 #include "task.h"
 
-#ifdef _WIN32
-
-TEST_IMPL(we_get_signal) {
-  return 0;
-}
-
-
-TEST_IMPL(we_get_signals) {
-  return 0;
-}
-
-#else /* !_WIN32 */
-
+#include <errno.h>
+#include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
-#include <errno.h>
-
-/* This test does not pretend to be cross-platform. */
-#include <pthread.h>
-#include <signal.h>
 #include <unistd.h>
 
 #define NSIGNALS  10
diff --git a/uv.gyp b/uv.gyp
index 0a7f832c..e0abd167 100644
--- a/uv.gyp
+++ b/uv.gyp
@@ -303,7 +303,6 @@
         'test/test-tcp-unexpected-read.c',
         'test/test-threadpool.c',
         'test/test-mutexes.c',
-        'test/test-signal.c',
         'test/test-thread.c',
         'test/test-barrier.c',
         'test/test-condvar.c',