diff --git a/ChangeLog b/ChangeLog
index db6706297b..fe03868e5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 12 09:30:00 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::GlobOption#non_options): run tests
+	  under base directory if no argument given.
+
 Sat Feb 12 08:03:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/ruby/test_settracefunc.rb (TestSetTraceFunc): ensure to use
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 25ff6cc980..c0bb7736e3 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -100,6 +100,7 @@ module Test
         if reject = options.delete(:reject)
           reject_pat = Regexp.union(reject.map {|r| /#{r}/ })
         end
+        files << "" if files.empty?
         files.map! {|f|
           f = f.tr(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
           [*(paths if /\A\.\.?(?:\z|\/)/ !~ f), nil].uniq.any? do |prefix|