diff --git a/ChangeLog b/ChangeLog
index 35e3d63969..3163cbc196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Nov 19 22:44:43 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/test/unit/collector/dir.rb: better support for -p/-x option.
+
 Fri Nov 19 17:46:56 2004  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/maker/0.9.rb (RSS::Maker::RSS09::Image#have_required_values): 
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
index b7927b867f..91561f3d38 100644
--- a/lib/test/unit/collector/dir.rb
+++ b/lib/test/unit/collector/dir.rb
@@ -55,6 +55,7 @@ module Test
                 sub_suite = recursive_collect(e_name, already_gathered)
                 sub_suites << sub_suite unless(sub_suite.empty?)
               else
+                next unless %r(/test_.*\.rb\Z) =~ e_name
                 (next unless(@pattern =~ e_name)) if(@pattern)
                 (next if(@exclude =~ e_name)) if(@exclude)
                 collect_file(e_name, sub_suites, already_gathered)