2 files changed, 3 insertions, 2 deletions
diff --git a/test/rdoc/support/test_case.rb b/test/rdoc/support/test_case.rb
index 36009111e2..d98dbe0d7b 100644
--- a/test/rdoc/support/test_case.rb
+++ b/test/rdoc/support/test_case.rb
@@ -37,7 +37,8 @@ class RDoc::TestCase < Test::Unit::TestCase
     super
 
     @orig_home = ENV["HOME"]
-    ENV["HOME"] = Dir.tmpdir
+    FileUtils.mkdir_p(@test_home = Dir.mktmpdir("test_rdoc_"))
+    ENV["HOME"] = @test_home
 
     @top_level = nil
 
@@ -64,6 +65,7 @@ class RDoc::TestCase < Test::Unit::TestCase
 
   def teardown
     ENV["HOME"] = @orig_home if defined?(@orig_home)
+    defined?(@test_home) and FileUtils.rm_rf @test_home
 
     super
   end
diff --git a/test/rdoc/support/text_formatter_test_case.rb b/test/rdoc/support/text_formatter_test_case.rb
index 22a762b5f0..e359028a29 100644
--- a/test/rdoc/support/text_formatter_test_case.rb
+++ b/test/rdoc/support/text_formatter_test_case.rb
@@ -112,4 +112,3 @@ class RDoc::Markup::TextFormatterTestCase < RDoc::Markup::FormatterTestCase
   end
 
 end
-