diff --git a/ChangeLog b/ChangeLog
index 15b3472a40..09dc8d8755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug 26 19:17:47 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/test/unit/collector/dir.rb: $: bug fix. [ruby-core:24115]
+
 Mon Aug 24 21:33:34 2009  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/maker/base.rb, test/rss/test_maker_2.0.rb: fix a bug
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
index 97c8d28481..9a1c40e9a6 100644
--- a/lib/test/unit/collector/dir.rb
+++ b/lib/test/unit/collector/dir.rb
@@ -91,7 +91,7 @@ module Test
           end
           find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)}
         ensure
-          $:.delete_at($:.rindex(dir)) if(dir)
+          $:.delete_at($:.index(dir)) if(dir)
         end
 
 	def realdir(path)