diff --git a/ChangeLog b/ChangeLog
index 0810d9f973..ece7d0f192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 23 11:12:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_usage2): now
+	  --help option is for modern terminals.
+
 Fri Nov 23 10:45:00 2012  Zachary Scott  <zachary@zacharyscott.net>
 
 	* ext/socket/ipsocket.c (IPSocket#peeraddr): Fix example
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index c77aa1f3dd..0291850ba8 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -1,3 +1,4 @@
+# -*- coding: us-ascii -*-
 require 'test/unit'
 
 require 'tmpdir'
@@ -38,10 +39,6 @@ class TestRubyOptions < Test::Unit::TestCase
       assert_operator(r[1..-1].collect{|x| x.size}.max, :<=, 80)
       assert_equal([], e)
     end
-    assert_in_out_err(%w(--help)) do |r, e|
-      assert_operator(r[1..-1].collect{|x| x.size}.max, :<=, 80)
-      assert_equal([], e)
-    end
   end
 
   def test_option_variables