diff --git a/ChangeLog b/ChangeLog
index dae08823d5..0989742e9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun  7 15:28:38 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive: Fix method name
+	  (generate_casefold_tests -> generate_case_mapping_tests).
+
 Tue Jun  7 15:05:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* regenc.h/c: Rename onigenc_not_support_case_map to
diff --git a/test/ruby/enc/test_case_comprehensive.rb b/test/ruby/enc/test_case_comprehensive.rb
index 445d355ef9..f040e6be83 100644
--- a/test/ruby/enc/test_case_comprehensive.rb
+++ b/test/ruby/enc/test_case_comprehensive.rb
@@ -98,7 +98,7 @@ class TestComprehensiveCaseFold < Test::Unit::TestCase
     @@tests ||= []
   end
 
-  def self.generate_casefold_tests (encoding)
+  def self.generate_case_mapping_tests (encoding)
     all_tests
     # preselect codepoints to speed up testing for small encodings
     codepoints = @@codepoints.select do |code|
@@ -136,11 +136,11 @@ class TestComprehensiveCaseFold < Test::Unit::TestCase
     %w[UnicodeData CaseFolding SpecialCasing].each { |f| check_file_available f }
   end
 
-  generate_casefold_tests 'US-ASCII'
-  generate_casefold_tests 'ASCII-8BIT'
-  generate_casefold_tests 'UTF-8'
-  generate_casefold_tests 'UTF-16BE'
-  generate_casefold_tests 'UTF-16LE'
-  generate_casefold_tests 'UTF-32BE'
-  generate_casefold_tests 'UTF-32LE'
+  generate_case_mapping_tests 'US-ASCII'
+  generate_case_mapping_tests 'ASCII-8BIT'
+  generate_case_mapping_tests 'UTF-8'
+  generate_case_mapping_tests 'UTF-16BE'
+  generate_case_mapping_tests 'UTF-16LE'
+  generate_case_mapping_tests 'UTF-32BE'
+  generate_case_mapping_tests 'UTF-32LE'
 end