2 files changed, 4 insertions, 8 deletions
diff --git a/Library/Homebrew/cmd/man.rb b/Library/Homebrew/cmd/man.rb
index f28d76de1..c1a202156 100644
--- a/Library/Homebrew/cmd/man.rb
+++ b/Library/Homebrew/cmd/man.rb
@@ -13,7 +13,7 @@ module Homebrew
       end
     end
 
-    which("ronn") || odie("You need to \"gem install ronn\" and put it in your path.")
+    Homebrew.install_gem_setup_path! "ronn"
 
     if ARGV.include?("--server") || ARGV.include?("-s")
       puts "Man page test server: http://localhost:1207/"
diff --git a/Library/Homebrew/cmd/tests.rb b/Library/Homebrew/cmd/tests.rb
index 623c14f04..93f70f8eb 100644
--- a/Library/Homebrew/cmd/tests.rb
+++ b/Library/Homebrew/cmd/tests.rb
@@ -1,12 +1,8 @@
 module Homebrew
   def tests
-    (HOMEBREW_LIBRARY/'Homebrew/test').cd do
-      ENV['TESTOPTS'] = '-v' if ARGV.verbose?
-      quiet_system("gem", "list", "--installed", "bundler") || \
-        system("gem", "install", "--no-ri", "--no-rdoc",
-               "--user-install", "bundler")
-      require 'rubygems'
-      ENV["PATH"] = "#{Gem.user_dir}/bin:#{ENV["PATH"]}"
+    (HOMEBREW_LIBRARY/"Homebrew/test").cd do
+      ENV["TESTOPTS"] = "-v" if ARGV.verbose?
+      Homebrew.install_gem_setup_path! "bundler"
       quiet_system("bundle", "check") || \
         system("bundle", "install", "--path", "vendor/bundle")
       system "bundle", "exec", "rake", "test"