diff --git a/ChangeLog b/ChangeLog
index fb4345d043..d4940a8f9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug  5 18:02:53 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/io/nonblock/test_flush.rb (TestIONonblock#test_flush):
+	  rescue some exceptions. [ruby-dev:35638]
+
 Tue Aug  5 16:40:06 2008  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (chdir): handle 5xx errors correctly.
diff --git a/test/io/nonblock/test_flush.rb b/test/io/nonblock/test_flush.rb
index b41afe1101..2217dbcec9 100644
--- a/test/io/nonblock/test_flush.rb
+++ b/test/io/nonblock/test_flush.rb
@@ -24,7 +24,11 @@ class TestIONonblock < Test::Unit::TestCase
           result << s
         end
       }
-      w.flush # assert_raise(IOError, "[ruby-dev:24985]") {w.flush}
+      begin
+        w.flush # assert_raise(IOError, "[ruby-dev:24985]") {w.flush}
+      rescue Errno::EBADF, IOError
+        # ignore [ruby-dev:35638]
+      end
       assert_nothing_raised {t.join}
     }
     assert_equal(4097, result.size)