diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index c33d1bba21..b917e1f396 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -76,8 +76,6 @@ class Gem::TestCase < Test::Unit::TestCase
 
   attr_accessor :uri # :nodoc:
 
-  @@tempdirs = []
-
   def assert_activate(expected, *specs)
     specs.each do |spec|
       case spec
@@ -289,8 +287,7 @@ class Gem::TestCase < Test::Unit::TestCase
 
     FileUtils.mkdir_p @tmp
 
-    @tempdir = Dir.mktmpdir(method_name.to_s, @tmp)
-    @@tempdirs << @tempdir
+    @tempdir = Dir.mktmpdir("test_rubygems_", @tmp)
 
     ENV["GEM_VENDOR"] = nil
     ENV["GEMRC"] = nil
@@ -474,8 +471,6 @@ class Gem::TestCase < Test::Unit::TestCase
     end
 
     @back_ui.close
-
-    assert_empty @@tempdirs.select {|tempdir| File.exist?(tempdir) }
   end
 
   def credential_setup