diff --git a/test/test-list.h b/test/test-list.h
index 95b2f2b6..c005800f 100644
--- a/test/test-list.h
+++ b/test/test-list.h
@@ -303,8 +303,10 @@ TEST_DECLARE   (ip6_addr_link_local)
 TEST_DECLARE   (poll_close_doesnt_corrupt_stack)
 TEST_DECLARE   (poll_closesocket)
 TEST_DECLARE   (spawn_detect_pipe_name_collisions_on_windows)
+#if !defined(USING_UV_SHARED)
 TEST_DECLARE   (argument_escaping)
 TEST_DECLARE   (environment_creation)
+#endif
 TEST_DECLARE   (listen_with_simultaneous_accepts)
 TEST_DECLARE   (listen_no_simultaneous_accepts)
 TEST_DECLARE   (fs_stat_root)
@@ -625,8 +627,10 @@ TASK_LIST_START
   TEST_ENTRY  (poll_close_doesnt_corrupt_stack)
   TEST_ENTRY  (poll_closesocket)
   TEST_ENTRY  (spawn_detect_pipe_name_collisions_on_windows)
+#if !defined(USING_UV_SHARED)
   TEST_ENTRY  (argument_escaping)
   TEST_ENTRY  (environment_creation)
+# endif
   TEST_ENTRY  (listen_with_simultaneous_accepts)
   TEST_ENTRY  (listen_no_simultaneous_accepts)
   TEST_ENTRY  (fs_stat_root)
diff --git a/test/test-spawn.c b/test/test-spawn.c
index c7343d45..f4e9ea65 100644
--- a/test/test-spawn.c
+++ b/test/test-spawn.c
@@ -994,6 +994,7 @@ TEST_IMPL(spawn_detect_pipe_name_collisions_on_windows) {
 }
 
 
+#if !defined(USING_UV_SHARED)
 int make_program_args(char** args, int verbatim_arguments, WCHAR** dst_ptr);
 WCHAR* quote_cmd_arg(const WCHAR *source, WCHAR *target);
 
@@ -1196,6 +1197,7 @@ TEST_IMPL(environment_creation) {
 
   return 0;
 }
+#endif
 
 /* Regression test for issue #909 */
 TEST_IMPL(spawn_with_an_odd_path) {
diff --git a/uv.gyp b/uv.gyp
index 2a742f13..da91716f 100644
--- a/uv.gyp
+++ b/uv.gyp
@@ -430,6 +430,9 @@
             '_XOPEN_SOURCE=500',
           ],
         }],
+        ['uv_library=="shared_library"', {
+          'defines': [ 'USING_UV_SHARED=1' ]
+        }],
       ],
       'msvs-settings': {
         'VCLinkerTool': {
@@ -481,7 +484,10 @@
             'test/runner-unix.c',
             'test/runner-unix.h',
           ]
-        }]
+        }],
+        ['uv_library=="shared_library"', {
+          'defines': [ 'USING_UV_SHARED=1' ]
+        }],
       ],
       'msvs-settings': {
         'VCLinkerTool': {