diff --git a/ChangeLog b/ChangeLog
index 3d43cc1b16..85b50c39d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 28 13:12:06 2008  Tanaka Akira  <akr@fsij.org>
+
+	* test/rubygems/test_gem.rb (test_self_path_APPLE_GEM_HOME): don't use
+	  fixed /tmp/apple_gem_home directory.
+
 Sat Jun 28 08:40:18 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c : check String encoding when
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 0c2a03160d..c26eeb573d 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -3,6 +3,7 @@ require 'rubygems'
 require 'rubygems/gem_openssl'
 require 'rubygems/installer'
 require 'pathname'
+require 'tmpdir'
 
 class TestGem < RubyGemTestCase
 
@@ -260,9 +261,10 @@ class TestGem < RubyGemTestCase
   unless win_platform?
     def test_self_path_APPLE_GEM_HOME
       Gem.clear_paths
-      Gem.const_set :APPLE_GEM_HOME, '/tmp/apple_gem_home'
-  
-      assert Gem.path.include?('/tmp/apple_gem_home')
+      Dir.mktmpdir("apple_gem_home") {|d|
+        Gem.const_set :APPLE_GEM_HOME, d
+        assert Gem.path.include?(d)
+      }
     ensure
       Gem.send :remove_const, :APPLE_GEM_HOME
     end