diff --git a/ChangeLog b/ChangeLog
index f84f3978e0..4e8eb2aacd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun  3 21:48:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rubygems/test_case.rb: Refix for test-all in separate directory.
+	  r31147 + r31151.
+
 Fri Jun  3 20:58:47 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/date/date_core.c (d_lite_plus): get rid of compiler warnings.
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index 3b26d31611..7923fac7ed 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -103,7 +103,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   undef_method :default_test if instance_methods.include? 'default_test' or
                                 instance_methods.include? :default_test
 
-  @@project_dir = Dir.pwd
+  @@project_dir = Dir.pwd unless defined?(@@project_dir)
 
   ##
   # #setup prepares a sandboxed location to install gems.  All installs are
@@ -122,6 +122,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     @orig_gem_home = ENV['GEM_HOME']
     @orig_gem_path = ENV['GEM_PATH']
 
+    @current_dir = Dir.pwd
     @ui = Gem::MockGemUi.new
 
     tmpdir = nil
@@ -228,7 +229,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
       Gem::RemoteFetcher.fetcher = nil
     end
 
-    Dir.chdir @@project_dir
+    Dir.chdir @current_dir
 
     FileUtils.rm_rf @tempdir unless ENV['KEEP_FILES']