diff --git a/ChangeLog b/ChangeLog
index eda62d2270..caaf2d3ef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun  2 19:17:47 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_argf.rb (teardown): remove renamed temporary files.
+
 Mon Jun  2 18:51:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/un.rb (wait_writable): wait until target files can be
diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb
index 8280e5e506..695b6f2196 100644
--- a/test/ruby/test_argf.rb
+++ b/test/ruby/test_argf.rb
@@ -18,6 +18,14 @@ class TestArgf < Test::Unit::TestCase
     @t3.puts "5"
     @t3.puts "6"
     @t3.close
+    @tmps = [@t1, @t2, @t3]
+  end
+
+  def teardown
+    @tmps.each {|t|
+      bak = t.path + ".bak"
+      File.unlink bak if File.file? bak
+    }
   end
 
   def make_tempfile
@@ -26,6 +34,7 @@ class TestArgf < Test::Unit::TestCase
     t.puts "bar"
     t.puts "baz"
     t.close
+    @tmps << t
     t
   end