diff --git a/ChangeLog b/ChangeLog
index c004c62ff2..b0827d6cb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 28 21:00:10 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_require.rb (test_require_too_long_filename):
+	  Kernel#require does not use dln_find_file_r (at r18242).
+
 Mon Jul 28 20:17:03 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* vm_core.h: move the definition of struct rb_mutex_struct.
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 497167819f..a5f453a055 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -19,13 +19,20 @@ class TestRequire < Test::Unit::TestCase
   end
 
   def test_require_too_long_filename
-    assert_in_out_err([], <<-INPUT, %w(:ok), /^.+$/)
+    assert_in_out_err([], <<-INPUT, %w(:ok), [])
       begin
         require '#{ "foo/" * 10000 }foo'
       rescue LoadError
         p :ok
       end
     INPUT
+
+    assert_in_out_err(["-S", "foo/" * 10000 + "foo"], "") do |r, e|
+      assert_equal([], r)
+      assert_operator(2, :<=, e.size)
+      assert_equal("openpath: pathname too long (ignored)", e.first)
+      assert_match(/\(LoadError\)/, e.last)
+    end
   end
 
   def test_require_path_home