diff --git a/ChangeLog b/ChangeLog
index f32827bc89..cd586e2957 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jun 14 22:36:09 2010  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_socket.rb (test_udp_server): rescue Errno::ENOSYS
+	  for Windows.
+
+	* test/socket/test_nonblock.rb (test_sendmsg_nonblock_error): ditto.
+
+	  [ruby-dev:41597] reported by Masaya Tarui.
+
 Mon Jun 14 17:44:39 2010  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: raise DRbConnError instead of ArgumentError if too
diff --git a/test/socket/test_nonblock.rb b/test/socket/test_nonblock.rb
index 59ff1522bc..59bd4f3aac 100644
--- a/test/socket/test_nonblock.rb
+++ b/test/socket/test_nonblock.rb
@@ -220,7 +220,7 @@ class TestSocketNonblock < Test::Unit::TestCase
         loop {
           s1.sendmsg_nonblock("a" * 100000)
         }
-      rescue NotImplementedError
+      rescue NotImplementedError, Errno::ENOSYS
         skip "sendmsg not implemented on this platform."
       rescue Errno::EMSGSIZE
         # UDP has 64K limit (if no Jumbograms).  No problem.
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index a2c0baf1e4..999976b999 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -289,7 +289,7 @@ class TestSocket < Test::Unit::TestCase
             assert_equal(ai.ip_address, addr.ip_address)
           }
         }
-      rescue NotImplementedError
+      rescue NotImplementedError, Errno::ENOSYS
         skipped = true
         skip "need sendmsg and recvmsg"
       ensure