diff --git a/ChangeLog b/ChangeLog
index d55aa0e606..ffee964109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 28 11:47:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_process.rb (TestProcess#test_too_long_path{,2}):
+	  should handle Errno::E2BIG, because this test checks crash of ruby,
+	  not the error type system.
+
 Fri Jan 28 11:23:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* io.c (rb_io_open): Use NUM2MODET() instead NUM2UINT().
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index d6a486c5c0..0df1491b68 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1234,11 +1234,15 @@ class TestProcess < Test::Unit::TestCase
 
   def test_too_long_path
     bug4314 = '[ruby-core:34842]'
-    assert_raise(Errno::ENOENT, bug4314) {Process.spawn("a" * 10_000_000)}
+    exs = [Errno::ENOENT]
+    exs << Errno::E2BIG if defined?(Errno::E2BIG)
+    assert_raise(*exs, bug4314) {Process.spawn("a" * 10_000_000)}
   end
 
   def test_too_long_path2
     bug4315 = '[ruby-core:34833]'
-    assert_raise(Errno::ENOENT, bug4315) {Process.spawn('"a"|'*10_000_000)}
+    exs = [Errno::ENOENT]
+    exs << Errno::E2BIG if defined?(Errno::E2BIG)
+    assert_raise(*exs, bug4315) {Process.spawn('"a"|'*10_000_000)}
   end
 end