diff --git a/ChangeLog b/ChangeLog
index f22a72db26..1315ad83f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  6 21:44:36 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/test_unicode_normalize.rb: Rename TestNormalize to
+	  TestUnicodeNormalize.
+	  Define constants under TestUnicodeNormalize.
+
 Thu Nov  6 21:22:59 2014  Tanaka Akira  <akr@fsij.org>
 
 	* test/open-uri/test_open-uri.rb: Check empty webrick log.
diff --git a/test/test_unicode_normalize.rb b/test/test_unicode_normalize.rb
index bfd2800019..64916a0855 100644
--- a/test/test_unicode_normalize.rb
+++ b/test/test_unicode_normalize.rb
@@ -4,11 +4,12 @@
 
 require 'test/unit'
 
-NormTest = Struct.new :source, :NFC, :NFD, :NFKC, :NFKD, :line
+class TestUnicodeNormalize < Test::Unit::TestCase
 
-UNICODE_VERSION = '7.0.0'
+  UNICODE_VERSION = '7.0.0'
+
+  NormTest = Struct.new :source, :NFC, :NFD, :NFKC, :NFKD, :line
 
-class TestNormalize < Test::Unit::TestCase
   def read_tests
     IO.readlines(File.expand_path("../enc/unicode/data/#{UNICODE_VERSION}/NormalizationTest.txt", __dir__), encoding: 'utf-8')
     .collect.with_index { |linedata, linenumber| [linedata, linenumber]}