diff --git a/ChangeLog b/ChangeLog
index 7e2c410b02..e1fef523aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec  1 09:33:32 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* test/runner.rb:  Set GEM_HOME, GEM_PATH and GEM_SKIP to empty set.
+	  With default_gem support in RubyGems GEM_SKIP prevents loading of
+          built-in gems.
+
 Sat Dec  1 07:16:17 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
 	* compile.c (ADD_CATCH_ENTRY): add a cast to fix SEGV with x64 mingw
diff --git a/test/runner.rb b/test/runner.rb
index 2eff70ec52..49844c798e 100644
--- a/test/runner.rb
+++ b/test/runner.rb
@@ -10,15 +10,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   @@project_dir = File.dirname($LOAD_PATH.last)
 end
 
-srcdir = File.dirname(src_testdir)
-default_gems = Dir.glob(srcdir + "/{lib,ext}/**/*.gemspec").map {|path| File.basename(path, ".*")}
-File.foreach(srcdir + "/defs/default_gems") do |line|
-  next if /^\s*#/ =~ line
-  default_gems << line[/^\S+/]
-end
-default_gems |= (ENV["GEM_SKIP"] || '').split(/:/)
-ENV["GEM_SKIP"] = default_gems.join(':')
-ENV["GEM_HOME"] = ENV["GEM_PATH"] = "".freeze
+ENV["GEM_SKIP"] = ENV["GEM_HOME"] = ENV["GEM_PATH"] = "".freeze
 
 require_relative 'profile_test_all' if ENV['RUBY_TEST_ALL_PROFILE'] == 'true'