diff --git a/ChangeLog b/ChangeLog
index 00ce4b7e0e..068b039fb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 23 03:05:12 2015  Eric Wong  <e@80x24.org>
+
+	* test/socket/test_basicsocket.rb: attempt fix for [ruby-cvs:60402]
+
 Wed Dec 23 02:59:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (__STDC_WANT_LIB_EXT1__): necessary to use memset_s
diff --git a/test/socket/test_basicsocket.rb b/test/socket/test_basicsocket.rb
index 52732f18f6..ac35f70955 100644
--- a/test/socket/test_basicsocket.rb
+++ b/test/socket/test_basicsocket.rb
@@ -134,7 +134,8 @@ class TestSocket_BasicSocket < Test::Unit::TestCase
   end
 
   def test_for_fd
-    assert_raise(Errno::EBADF, '[ruby-core:72418] [Bug #11854]') do
+    assert_raise(ArgumentError, # [ruby-cvs:60402]
+                 Errno::EBADF, '[ruby-core:72418] [Bug #11854]') do
       BasicSocket.for_fd(-1)
     end
     inet_stream do |sock|