diff --git a/ChangeLog b/ChangeLog
index 11c6024164..6518f58b50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun  6 08:52:13 2015  Eric Wong  <e@80x24.org>
+
+	* test/socket/test_nonblock.rb: try to avoid EMSGSIZE
+	  [ruby-core:69466]
+
 Sat Jun  6 07:58:30 2015  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c: remove struct mark_tbl_arg and pass objspace directly
diff --git a/test/socket/test_nonblock.rb b/test/socket/test_nonblock.rb
index b1959ee2c7..f0fba3af74 100644
--- a/test/socket/test_nonblock.rb
+++ b/test/socket/test_nonblock.rb
@@ -277,9 +277,9 @@ class TestSocketNonblock < Test::Unit::TestCase
 
   if defined?(UNIXSocket) && defined?(Socket::SOCK_SEQPACKET)
     def test_sendmsg_nonblock_seqpacket
-      buf = '*' * 10000
+      buf = '*' * 8192
       UNIXSocket.pair(:SEQPACKET) do |s1, s2|
-        assert_raise(IO::WaitWritable,Errno::EMSGSIZE) do
+        assert_raise(IO::WaitWritable) do
           loop { s1.sendmsg_nonblock(buf) }
         end
       end