diff --git a/ChangeLog b/ChangeLog
index d1b7470ec0..b61acf8a29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 22 18:34:02 2012  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb (setup_options): add option "--show-skip" to
+	  cancel "--hide-skip" (-q)
+
 Wed Feb 22 17:36:22 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_s_foreach): argument check before making Enumerator.
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index fa95aae2b2..7db23f8cea 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -112,6 +112,10 @@ module Test
         opts.on '-q', '--hide-skip', 'Hide skipped tests' do
           options[:hide_skip] = true
         end
+
+        opts.on '--show-skip', 'Show skipped tests' do
+          options[:hide_skip] = false
+        end
       end
 
       def non_options(files, options)
diff --git a/test/testunit/test_hideskip.rb b/test/testunit/test_hideskip.rb
index 967ecafba9..7fc04ae7eb 100644
--- a/test/testunit/test_hideskip.rb
+++ b/test/testunit/test_hideskip.rb
@@ -9,6 +9,13 @@ class TestHideSkip < Test::Unit::TestCase
     assert_match(/assertions\/s.\n\n  1\) Skipped/,test_out.read)
     test_out.close
 
+    test_out, o = IO.pipe
+    spawn(*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb",
+          "--show-skip", out: o, err: o)
+    o.close
+    assert_match(/assertions\/s.\n\n  1\) Skipped/,test_out.read)
+    test_out.close
+
     test_out, o = IO.pipe
     spawn(*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb",
           "--hide-skip", out: o, err: o)