diff --git a/ChangeLog b/ChangeLog
index a55609d5a2..4d1514a844 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 18 22:43:02 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_autoload.rb: remove temporally files early.
+
 Wed Jul 18 21:59:46 2012  Tanaka Akira  <akr@fsij.org>
 
 	* test/ruby/test_argf.rb: use temporally directory.
diff --git a/test/ruby/test_autoload.rb b/test/ruby/test_autoload.rb
index bfed40e9f4..8ca2187970 100644
--- a/test/ruby/test_autoload.rb
+++ b/test/ruby/test_autoload.rb
@@ -69,6 +69,8 @@ p Foo::Bar
     ensure
       remove_autoload_constant
     end
+  ensure
+    file.unlink
   end
 
   def test_threaded_accessing_constant
@@ -85,6 +87,8 @@ p Foo::Bar
     ensure
       remove_autoload_constant
     end
+  ensure
+    file.unlink
   end
 
   def test_threaded_accessing_inner_constant
@@ -101,6 +105,8 @@ p Foo::Bar
     ensure
       remove_autoload_constant
     end
+  ensure
+    file.unlink
   end
 
   def test_nameerror_when_autoload_did_not_define_the_constant
@@ -115,6 +121,8 @@ p Foo::Bar
     ensure
       remove_autoload_constant
     end
+  ensure
+    file.unlink
   end
 
   def test_override_autoload
@@ -128,6 +136,8 @@ p Foo::Bar
     ensure
       remove_autoload_constant
     end
+  ensure
+    file.unlink
   end
 
   def test_override_while_autoloading
@@ -148,6 +158,8 @@ p Foo::Bar
     ensure
       remove_autoload_constant
     end
+  ensure
+    file.unlink
   end
 
   def add_autoload(path)