diff --git a/ChangeLog b/ChangeLog
index 549b7bc7e3..e10be144f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov  4 13:08:01 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit.setup_argv): now can specify ``-xname''
+	  instead of ``-x name''.
+
 Tue Nov  4 08:00:00 2008  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
 
 	* test/zlib/test_zlib.rb(test_readchar): compare in same type.
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index c4c3724cd0..9e62d0cb45 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -15,12 +15,13 @@ module Test
       while arg = original_argv.shift
         case arg
         when '-v'
-          minitest_argv << '-v'
-        when '-n', '--name'
           minitest_argv << arg
-          minitest_argv << original_argv.shift
-        when '-x'
-          reject << original_argv.shift
+        when /\A(-n)(.+)?/, /\A(--name)=?\b(.+)?/
+          p [$1, $2]
+          minitest_argv << $1
+          minitest_argv << ($2 || original_argv.shift)
+        when /\A-x(.+)?/
+          reject << ($1 || original_argv.shift)
         else
           files << arg
         end