diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index a7ea3dc96a..07a885288f 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -208,12 +208,6 @@ module Homebrew
 
       puts "Randomized with seed #{seed}"
 
-      # Let tests find `bundle` in the actual location.
-      ENV["HOMEBREW_TESTS_GEM_USER_DIR"] = gem_user_dir
-
-      # Let `bundle` in PATH find its gem.
-      ENV["GEM_PATH"] = "#{ENV.fetch("GEM_PATH")}:#{gem_user_dir}"
-
       # Submit test flakiness information using BuildPulse
       # BUILDPULSE used in spec_helper.rb
       if use_buildpulse?
diff --git a/Library/Homebrew/utils/gems.rb b/Library/Homebrew/utils/gems.rb
index 7db328ef4a..44ef685ff7 100644
--- a/Library/Homebrew/utils/gems.rb
+++ b/Library/Homebrew/utils/gems.rb
@@ -17,14 +17,6 @@ module Homebrew
     "#{RbConfig::CONFIG["prefix"]}/bin"
   end
 
-  def gem_user_dir
-    ENV.fetch("HOMEBREW_TESTS_GEM_USER_DIR", nil) || Gem.user_dir
-  end
-
-  def gem_user_bindir
-    "#{gem_user_dir}/bin"
-  end
-
   def ohai_if_defined(message)
     if defined?(ohai)
       $stderr.ohai message
@@ -50,9 +42,9 @@ module Homebrew
     end
   end
 
-  def setup_gem_environment!(gem_home: nil, gem_bindir: nil, setup_path: true)
+  def setup_gem_environment!(setup_path: true)
     # Match where our bundler gems are.
-    gem_home ||= "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle/ruby/#{RbConfig::CONFIG["ruby_version"]}"
+    gem_home = "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle/ruby/#{RbConfig::CONFIG["ruby_version"]}"
     Gem.paths = {
       "GEM_HOME" => gem_home,
       "GEM_PATH" => gem_home,
@@ -65,10 +57,9 @@ module Homebrew
     return unless setup_path
 
     # Add necessary Ruby and Gem binary directories to `PATH`.
-    gem_bindir ||= Gem.bindir
     paths = ENV.fetch("PATH").split(":")
-    paths.unshift(gem_bindir) unless paths.include?(gem_bindir)
     paths.unshift(ruby_bindir) unless paths.include?(ruby_bindir)
+    paths.unshift(Gem.bindir) unless paths.include?(Gem.bindir)
     ENV["PATH"] = paths.compact.join(":")
 
     # Set envs so the above binaries can be invoked.
@@ -123,7 +114,7 @@ module Homebrew
       raise "Installing and using Bundler is currently only supported on Ruby 2.6."
     end
 
-    setup_gem_environment!(gem_home: gem_user_dir, gem_bindir: gem_user_bindir)
+    setup_gem_environment!
     install_gem_setup_path!(
       "bundler",
       version:               HOMEBREW_BUNDLER_VERSION,