diff --git a/ChangeLog b/ChangeLog
index b925ba5997..87881c3d62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 22 11:05:08 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_dir.rb: use realpath of tmpdir. [ruby-dev:35481]
+
+	* test/ruby/test_process.rb: ditto.
+
 Tue Jul 22 09:51:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el: fix here-doc strings with inner quotes.  patches
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index 4301a61dc0..36d7407d92 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -2,11 +2,12 @@ require 'test/unit'
 
 require 'tmpdir'
 require 'fileutils'
+require 'pathname'
 
 class TestDir < Test::Unit::TestCase
 
   def setup
-    @root = Dir.mktmpdir('__test_dir__')
+    @root = Pathname.new(Dir.mktmpdir('__test_dir__')).realpath.to_s
     @nodir = File.join(@root, "dummy")
     for i in ?a..?z
       if i.ord % 2 == 0
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index b45cbcc2dd..cd4410302b 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'tmpdir'
+require 'pathname'
 require_relative 'envutil'
 
 class TestProcess < Test::Unit::TestCase
@@ -21,6 +22,7 @@ class TestProcess < Test::Unit::TestCase
 
   def with_tmpchdir
     Dir.mktmpdir {|d|
+      d = Pathname.new(d).realpath.to_s
       Dir.chdir(d) {
         yield d
       }