diff --git a/test/rubygems/gemutilities.rb b/test/rubygems/gemutilities.rb
index 9c831917d8..965d898abc 100644
--- a/test/rubygems/gemutilities.rb
+++ b/test/rubygems/gemutilities.rb
@@ -566,7 +566,7 @@ Also, a list:
 
   @@ruby = rubybin
   env_rake = ENV['rake']
-  ruby19_rake = File.expand_path("../../bin/rake", __FILE__)
+  ruby19_rake = File.expand_path("../../../bin/rake", __FILE__)
   @@rake = if env_rake then
              ENV["rake"]
            elsif File.exist? ruby19_rake then
diff --git a/test/rubygems/test_gem_commands_uninstall_command.rb b/test/rubygems/test_gem_commands_uninstall_command.rb
index cd440f63ee..c9feb31ccb 100644
--- a/test/rubygems/test_gem_commands_uninstall_command.rb
+++ b/test/rubygems/test_gem_commands_uninstall_command.rb
@@ -65,7 +65,10 @@ class TestGemCommandsUninstallCommand < GemInstallerTestCase
     util_setup_gem
 
     use_ui @ui do
+      tmp_rake = ENV['rake']
+      ENV['rake'] = @@rake
       @installer.install
+      ENV['rake'] = tmp_rake
     end
 
     @cmd.options[:args] = ["pre"]