diff --git a/ChangeLog b/ChangeLog
index b4ea439f4f..4e523fdbce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 29 15:22:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/io/nonblock/test_flush.rb: abandon tests when io/nonblock is
+	  not supported.
+
 Mon Nov 29 13:37:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (fptr_finalize): must not use FILE after fclose().
@@ -107,7 +112,7 @@ Sat Nov 27 17:21:30 2004  Kouhei Sutou  <kou@cozmixng.org>
 
 	* sample/rss/rss_recent.rb: ditto.
 
-Sat Nov 27 14:44:15 2004  Kent Sibilev  <ksibilev@bellsouth.net>	
+Sat Nov 27 14:44:15 2004  Kent Sibilev  <ksibilev@bellsouth.net>
 
 	* lib/cgi/session.rb (CGI::Session::initialize): [ruby-core:03832]
 
diff --git a/test/io/nonblock/test_flush.rb b/test/io/nonblock/test_flush.rb
index dbe20722cf..4f56d00829 100644
--- a/test/io/nonblock/test_flush.rb
+++ b/test/io/nonblock/test_flush.rb
@@ -1,5 +1,8 @@
 require 'test/unit'
-require 'io/nonblock'
+begin
+  require 'io/nonblock'
+rescue LoadError
+end
 
 class TestIONonblock < Test::Unit::TestCase
   def test_flush                # [ruby-dev:24985]
@@ -23,4 +26,4 @@ class TestIONonblock < Test::Unit::TestCase
     t.join
     assert_equal("b", result)
   end
-end
+end if IO.method_defined?(:nonblock)