diff --git a/ChangeLog b/ChangeLog
index d3118cf40d..d74af376fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 30 16:43:23 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_string.rb (test_ord): Add test for String#ord.
+	  [Fix GH-1181]
+
 Wed Dec 30 11:28:57 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/forwardable.rb (def_instance_delegator): adjust backtrace of
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index 00e1f5f8ff..72fca75b29 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -2342,6 +2342,13 @@ class TestString < Test::Unit::TestCase
     assert_not_equal(str.object_id, (+str).object_id)
     assert_equal(str.object_id, (-str).object_id)
   end
+
+  def test_ord
+    assert_equal(97, "a".ord)
+    assert_equal(97, "abc".ord)
+    assert_equal(0x3042, "\u3042\u3043".ord)
+    assert_raise(ArgumentError) { "".ord }
+  end
 end
 
 class TestString2 < TestString