2 files changed, 21 insertions, 21 deletions
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index 164f13f716..e3a24e8583 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -5,25 +5,23 @@ require 'fileutils'
 
 class TestDir < Test::Unit::TestCase
 
-  ROOT = File.join(Dir.tmpdir, "__test_dir__#{$$}")
-
   def setup
-    Dir.mkdir(ROOT)
+    @root = Dir.mktmpdir
     for i in ?a..?z
       if i.ord % 2 == 0
-        FileUtils.touch(File.join(ROOT, i))
+        FileUtils.touch(File.join(@root, i))
       else
-        FileUtils.mkdir(File.join(ROOT, i))
+        FileUtils.mkdir(File.join(@root, i))
       end
     end
   end
 
   def teardown
-    FileUtils.rm_rf ROOT if File.directory?(ROOT)
+    FileUtils.remove_entry_secure @root if File.directory?(@root)
   end
 
   def test_seek
-    dir = Dir.open(ROOT)
+    dir = Dir.open(@root)
     begin
       cache = []
       loop do
diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index 2670933de2..49203ab2ea 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -7,21 +7,23 @@ class TestFile < Test::Unit::TestCase
   # I don't know Ruby's spec about "unlink-before-close" exactly.
   # This test asserts current behaviour.
   def test_unlink_before_close
-    filename = Dir.tmpdir + '/' + File.basename(__FILE__) + ".#{$$}"
-    w = File.open(filename, "w")
-    w << "foo"
-    w.close
-    r = File.open(filename, "r")
-    begin
-      if /(mswin|bccwin|mingw|emx)/ =~ RUBY_PLATFORM
-        assert_raise(Errno::EACCES) {File.unlink(filename)}
-      else
-	assert_nothing_raised {File.unlink(filename)}
+    Dir.mktmpdir {|tmpdir|
+      filename = tmpdir + '/' + File.basename(__FILE__) + ".#{$$}"
+      w = File.open(filename, "w")
+      w << "foo"
+      w.close
+      r = File.open(filename, "r")
+      begin
+        if /(mswin|bccwin|mingw|emx)/ =~ RUBY_PLATFORM
+          assert_raise(Errno::EACCES) {File.unlink(filename)}
+        else
+          assert_nothing_raised {File.unlink(filename)}
+        end
+      ensure
+        r.close
+        File.unlink(filename) if File.exist?(filename)
       end
-    ensure
-      r.close
-      File.unlink(filename) if File.exist?(filename)
-    end
+    }
   end
 
   include TestEOF