diff --git a/ChangeLog b/ChangeLog
index 8b9aa3b1ac..91c7aed0de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 11 04:34:39 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
+
+	* test/test_cmath.rb: Add assertions for error handling.
+
 Thu Jun 11 00:34:39 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* template/fake.rb.in: expanded macro result may have spaces
diff --git a/test/test_cmath.rb b/test/test_cmath.rb
index e911fcb9e7..d2dbf58178 100644
--- a/test/test_cmath.rb
+++ b/test/test_cmath.rb
@@ -41,6 +41,14 @@ class TestCMath < Test::Unit::TestCase
     assert_in_delta 0.17328679513998635+1.1780972450961724i , CMath.atanh(1+2i)
   end
 
+  def test_error_handling
+    assert_raise_with_message(TypeError, "Numeric Number required") { CMath.acos("2") }
+    assert_raise_with_message(TypeError, "Numeric Number required") { CMath.log("2") }
+    assert_raise(ArgumentError) { CMath.log(2, "2") }
+    assert_raise(NoMethodError) { CMath.log(2, 2i) }
+    assert_raise(RangeError) { CMath.hypot(2i, 2i) }
+  end
+
   def test_cbrt_returns_principal_value_of_cube_root
     assert_equal (-8)**(1.0/3), CMath.cbrt(-8), '#3676'
   end