diff --git a/ChangeLog b/ChangeLog
index 847b8cb97e..e886a6508e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 25 20:01:01 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* test/test-unicode_normalize.rb: added
+	  test_raise_exception_for_non_unicode_encoding.
+
 Sat Oct 25 19:30:30 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
 
 	* test/test-unicode_normalize.rb: removed unused function.
diff --git a/test/test_unicode_normalize.rb b/test/test_unicode_normalize.rb
index 8db64a64f3..c846e90f26 100644
--- a/test/test_unicode_normalize.rb
+++ b/test/test_unicode_normalize.rb
@@ -148,4 +148,10 @@ class TestNormalize < Test::Unit::TestCase
     assert_equal "\u1100\u1161\u0323\u0300", "\uAC00\u0300\u0323".unicode_normalize(:nfd)
     assert_equal "\u1100\u1161\u0323\u0300", "\u1100\u1161\u0300\u0323".unicode_normalize(:nfd)
   end
+  
+  def test_raise_exception_for_non_unicode_encoding
+    assert_raise(Encoding::CompatibilityError) { "abc".force_encoding('ISO-8859-1').unicode_normalize }
+    assert_raise(Encoding::CompatibilityError) { "abc".force_encoding('ISO-8859-1').unicode_normalize! }
+    assert_raise(Encoding::CompatibilityError) { "abc".force_encoding('ISO-8859-1').unicode_normalized? }
+  end
 end