diff --git a/ChangeLog b/ChangeLog
index b658b67725..ed9c2a8902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 16 12:52:14 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_file):
+	  rename from file_assertion.
+
 Tue Oct 16 11:30:18 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_join): hide the result under construction until
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index d6f46f4401..3e04f55c0c 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -225,11 +225,11 @@ module Test
         assert(1.0/f == -Float::INFINITY, "#{f} is not -0.0")
       end
 
-      def file_assertion
-        FileAssertion
+      def assert_file
+        AssertFile
       end
 
-      class << (FileAssertion = Object.new)
+      class << (AssertFile = Object.new)
         include Assertions
         def assert_file_predicate(predicate, *args)
           if /\Anot_/ =~ predicate
diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index e005dc8d69..9c93f16576 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -44,7 +44,7 @@ class TestFile < Test::Unit::TestCase
     bug6487 = '[ruby-core:45203]'
     f = Tempfile.new(__method__.to_s)
     f.close
-    file_assertion.exist?(f.path)
+    assert_file.exist?(f.path)
     assert_nothing_raised(bug6487) {File.read(f.path, mode: 'r:utf-8')}
     assert_nothing_raised(bug6487) {File.read(f.path, mode: 'r:bom|utf-8')}
     f.close(true)
@@ -356,7 +356,7 @@ class TestFile < Test::Unit::TestCase
       assert_raise(ArgumentError) do
         open(path + "\0bar", "w") {}
       end
-      file_assertion.not_exist?(path)
+      assert_file.not_exist?(path)
     end
   end
 end
diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index 10d04ddf15..94b02c4134 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -120,7 +120,7 @@ class TestFileExhaustive < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       prefix = File.join(dir, "...a")
       Dir.mkdir(prefix)
-      file_assertion.exist?(prefix)
+      assert_file.exist?(prefix)
 
       assert_nothing_raised { File.stat(prefix) }
 
@@ -170,9 +170,9 @@ class TestFileExhaustive < Test::Unit::TestCase
   end
 
   def test_exist_p
-    file_assertion.exist?(@dir)
-    file_assertion.exist?(@file)
-    file_assertion.not_exist?(@nofile)
+    assert_file.exist?(@dir)
+    assert_file.exist?(@file)
+    assert_file.not_exist?(@nofile)
   end
 
   def test_readable_p
@@ -399,8 +399,8 @@ class TestFileExhaustive < Test::Unit::TestCase
 
   def test_rename
     assert_equal(0, File.rename(@file, @nofile))
-    file_assertion.not_exist?(@file)
-    file_assertion.exist?(@nofile)
+    assert_file.not_exist?(@file)
+    assert_file.exist?(@nofile)
     assert_equal(0, File.rename(@nofile, @file))
     assert_raise(Errno::ENOENT) { File.rename(@nofile, @file) }
   end
@@ -809,21 +809,21 @@ class TestFileExhaustive < Test::Unit::TestCase
 
   def test_truncate
     assert_equal(0, File.truncate(@file, 1))
-    file_assertion.exist?(@file)
+    assert_file.exist?(@file)
     assert_equal(1, File.size(@file))
     assert_equal(0, File.truncate(@file, 0))
-    file_assertion.exist?(@file)
-    file_assertion.zero?(@file)
+    assert_file.exist?(@file)
+    assert_file.zero?(@file)
     make_file("foo", @file)
     assert_raise(Errno::ENOENT) { File.truncate(@nofile, 0) }
 
     f = File.new(@file, "w")
     assert_equal(0, f.truncate(2))
-    file_assertion.exist?(@file)
+    assert_file.exist?(@file)
     assert_equal(2, File.size(@file))
     assert_equal(0, f.truncate(0))
-    file_assertion.exist?(@file)
-    file_assertion.zero?(@file)
+    assert_file.exist?(@file)
+    assert_file.zero?(@file)
     f.close
     make_file("foo", @file)
 
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 83f074af81..515e6e3d24 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -403,8 +403,8 @@ class TestProcess < Test::Unit::TestCase
     with_tmpchdir {|d|
       Dir.mkdir "foo"
       system(*PWD, :chdir => "foo", :out => "open_chdir_test")
-      file_assertion.exist?("open_chdir_test")
-      file_assertion.not_exist?("foo/open_chdir_test")
+      assert_file.exist?("open_chdir_test")
+      assert_file.not_exist?("foo/open_chdir_test")
       assert_equal("#{d}/foo", File.read("open_chdir_test").chomp)
     }
   end
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 25b49762f2..a7c75d06bf 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -109,7 +109,7 @@ class TestRequire < Test::Unit::TestCase
     Dir.mktmpdir do |tmp|
       req = File.join(tmp, "very_long_file_name.rb")
       File.write(req, "p :ok\n")
-      file_assertion.exist?(req)
+      assert_file.exist?(req)
       req[/.rb$/i] = ""
       assert_in_out_err(['--disable-gems'], <<-INPUT, %w(:ok), [])
         require "#{req}"
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 0cf0f597b4..24731a38c1 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -388,7 +388,7 @@ class TestRubyOptions < Test::Unit::TestCase
     rubybin = Regexp.quote(EnvUtil.rubybin)
     pat = Regexp.quote(notexist)
     bug1573 = '[ruby-core:23717]'
-    file_assertion.not_exist?(notexist)
+    assert_file.not_exist?(notexist)
     assert_in_out_err(["-r", notexist, "-ep"], "", [], /.* -- #{pat} \(LoadError\)/, bug1573)
     assert_in_out_err([notexist], "", [], /#{rubybin}:.* -- #{pat} \(LoadError\)/, bug1573)
   end
diff --git a/test/ruby/test_whileuntil.rb b/test/ruby/test_whileuntil.rb
index 6ce2fa30c6..9731879122 100644
--- a/test/ruby/test_whileuntil.rb
+++ b/test/ruby/test_whileuntil.rb
@@ -69,7 +69,7 @@ class TestWhileuntil < Test::Unit::TestCase
       tmp.close
 
       File.unlink tmpfilename or `/bin/rm -f "#{tmpfilename}"`
-      file_assertion.not_exist?(tmpfilename)
+      assert_file.not_exist?(tmpfilename)
     }
   end