diff --git a/ChangeLog b/ChangeLog
index 5cbd59b0ae..fc8ae2c2a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 14 16:25:46 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/erb/test_erb.rb (test_html_escape): add assertions for the
+	  cases where the argument is not a String.
+
 Tue Aug 14 16:03:31 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (check_valid_dir): reject "..." as directory name.
diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb
index e3bc54a61f..fc1e1fcbc6 100644
--- a/test/erb/test_erb.rb
+++ b/test/erb/test_erb.rb
@@ -46,6 +46,9 @@ class TestERB < Test::Unit::TestCase
     assert_equal("", ERB::Util.html_escape(""))
     assert_equal("abc", ERB::Util.html_escape("abc"))
     assert_equal("&lt;&lt;", ERB::Util.html_escape("<<"))
+
+    assert_equal("", ERB::Util.html_escape(nil))
+    assert_equal("123", ERB::Util.html_escape(123))
   end
 end