diff --git a/ChangeLog b/ChangeLog
index 10872d6a44..7eb14d931f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul  2 11:36:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rubygems/test_gem_resolver_git_specification.rb: require
+	  rubygems/installer.rb before Gem::TestCase#setup runs, otherwise
+	  as Gem::TestCase#teardown restores $LOADED_FEATURES to the state
+	  at that time, the requiring the file in GitSpecification#install
+	  method causes a lot of constant redefinitions.
+
 Thu Jul  2 10:43:36 2015  Eric Wong  <e@80x24.org>
 
 	* ext/socket/rubysocket.h: flags for common socket families
diff --git a/test/rubygems/test_gem_resolver_git_specification.rb b/test/rubygems/test_gem_resolver_git_specification.rb
index a31674a218..7ab297923c 100644
--- a/test/rubygems/test_gem_resolver_git_specification.rb
+++ b/test/rubygems/test_gem_resolver_git_specification.rb
@@ -1,4 +1,5 @@
 require 'rubygems/test_case'
+require 'rubygems/installer'
 
 class TestGemResolverGitSpecification < Gem::TestCase