diff --git a/ChangeLog b/ChangeLog
index 8638315d66..40e2ec4a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul  2 12:26:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rubygems/test_gem_server.rb (process_based_port): use
+	  dynamically chosen port numberss to get rid of conflicts.
+
 Thu Jul  2 11:58:59 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/rubygems/test_gem_specification.rb: skip tests which the
diff --git a/test/rubygems/test_gem_server.rb b/test/rubygems/test_gem_server.rb
index 964048615c..98a703c9d2 100644
--- a/test/rubygems/test_gem_server.rb
+++ b/test/rubygems/test_gem_server.rb
@@ -7,6 +7,10 @@ class Gem::Server
 end
 
 class TestGemServer < Gem::TestCase
+  def process_based_port
+    0
+  end
+
   def setup
     super