diff --git a/ChangeLog b/ChangeLog
index 4817f97713..8f696db281 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Nov 19 11:10:16 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/test/unit/collector/dir.rb: add support for directory name
+	  with -p/-x options.
+
+	* test/testunit/collector/test_dir.rb: ditto.
+
 Fri Nov 19 10:32:36 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* ext/readline/readline.c (readline_s_set_completion_append_character):
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
index 1d65132a45..b7927b867f 100644
--- a/lib/test/unit/collector/dir.rb
+++ b/lib/test/unit/collector/dir.rb
@@ -15,7 +15,7 @@ module Test
           @file = file
           @object_space = object_space
           @req = req
-          @pattern = /\Atest_.*\.rb\Z/m
+          @pattern = /\btest_.*\.rb\Z/m
           @exclude = nil
         end
 
@@ -55,8 +55,8 @@ module Test
                 sub_suite = recursive_collect(e_name, already_gathered)
                 sub_suites << sub_suite unless(sub_suite.empty?)
               else
-                (next unless(@pattern =~ e)) if(@pattern)
-                (next if(@exclude =~ e)) if(@exclude)
+                (next unless(@pattern =~ e_name)) if(@pattern)
+                (next if(@exclude =~ e_name)) if(@exclude)
                 collect_file(e_name, sub_suites, already_gathered)
               end
             end
diff --git a/test/testunit/collector/test_dir.rb b/test/testunit/collector/test_dir.rb
index 64bcabaea6..7ab3f45a90 100644
--- a/test/testunit/collector/test_dir.rb
+++ b/test/testunit/collector/test_dir.rb
@@ -385,7 +385,7 @@ module Test
           expected = TestSuite.new('[d1, d2]')
           expected << (TestSuite.new('d1') << @t3.suite)
           expected << (TestSuite.new('d2') << @t5.suite)
-          @c.pattern = /^test_/
+          @c.pattern = /\btest_/
           assert_equal(expected, @c.collect('d1', 'd2'))
         end
       end