diff --git a/ChangeLog b/ChangeLog
index 8a1cf55d28..d50241a3d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,13 @@
-Mon Oct  2 22:28:17 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Oct  2 23:47:55 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::COLLECTORS):
 	  base directory should be lower precedence.  fixed: [ruby-dev:29622]
 
 	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): typo.
 
+	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
+	  load expanded path.  fixed: [ruby-dev:29621]
+
 Mon Oct  2 15:47:55 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* instruby.rb: batfile should be CRLF'ed.
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
index 2cee7dde44..dadd9408c7 100644
--- a/lib/test/unit/collector/dir.rb
+++ b/lib/test/unit/collector/dir.rb
@@ -77,7 +77,7 @@ module Test
         end
 
         def collect_file(name, suites, already_gathered)
-          dir = File.dirname(File.expand_path(name, @base))
+          dir = File.dirname(name = File.expand_path(name, @base))
           $:.unshift(dir)
           if(@req)
             @req.require(name)