diff --git a/ChangeLog b/ChangeLog
index 5d2339cc19..70c339afc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 16 10:22:52 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/rake/helper.rb (Rake::TestCase#setup): @orig_PWD shouldn't be
+	  Dir.pwd when the build directory is different from source directory.
+
 Fri Nov 16 09:41:08 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/rake/version.rb:  workaround fix to build. see #7366
diff --git a/test/rake/helper.rb b/test/rake/helper.rb
index 288ff0e3b2..b54390e0b8 100644
--- a/test/rake/helper.rb
+++ b/test/rake/helper.rb
@@ -31,7 +31,7 @@ class Rake::TestCase < MiniTest::Unit::TestCase
   def setup
     ARGV.clear
 
-    @orig_PWD = Dir.pwd
+    @orig_PWD = File.expand_path('../../..', __FILE__)
     @orig_APPDATA      = ENV['APPDATA']
     @orig_HOME         = ENV['HOME']
     @orig_HOMEDRIVE    = ENV['HOMEDRIVE']