diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index afccf9d885827ae34901414a284219a4d92f2b6e..0625e5fbd7aff957d5facfba76bc00ac5dfbddc3 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -1,7 +1,6 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/plugin/plugin_generator'
 require 'generators/shared_generator_tests'
-require 'mocha/setup' # FIXME: stop using mocha
 
 DEFAULT_PLUGIN_FILES = %w(
   .gitignore
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index 77372fb514c6620d35a4cc879d10638f75867b2c..a365de885ede6635797646d5b2f72e94c393874f 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -28,9 +28,22 @@ def test_skeleton_is_created
 
   def assert_generates_with_bundler(options = {})
     generator([destination_root], options)
-    generator.expects(:bundle_command).with('install').once
-    generator.stubs(:bundle_command).with('exec spring binstub --all')
-    quietly { generator.invoke_all }
+
+    command_check = -> command do
+      @install_called ||= 0
+
+      case command
+      when 'install'
+        @install_called += 1
+        assert_equal 1, @install_called, "install expected to be called once, but was called #{@install_called} times"
+      when 'exec spring binstub --all'
+        # Called when running tests with spring, let through unscathed.
+      end
+    end
+
+    generator.stub :bundle_command, command_check do
+      quietly { generator.invoke_all }
+    end
   end
 
   def test_generation_runs_bundle_install
@@ -91,8 +104,15 @@ def test_template_is_executed_when_supplied_an_https_path
     template = %{ say "It works!" }
     template.instance_eval "def read; self; end" # Make the string respond to read
 
-    generator([destination_root], template: path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
-    quietly { assert_match(/It works!/, capture(:stdout) { generator.invoke_all }) }
+    check_open = -> *args do
+      assert_equal [ path, 'Accept' => 'application/x-thor-template' ], args
+      template
+    end
+
+    generator = generator([destination_root], template: path)
+    generator([destination_root], template: path).stub(:open, check_open, template) do
+      quietly { assert_match(/It works!/, capture(:stdout) { generator.invoke_all }) }
+    end
   end
 
   def test_dev_option
@@ -107,18 +127,19 @@ def test_edge_option
   end
 
   def test_skip_gemfile
-    generator([destination_root], skip_gemfile: true).expects(:bundle_command).never
-    quietly { generator.invoke_all }
-    assert_no_file 'Gemfile'
+    assert_not_called(generator([destination_root], skip_gemfile: true), :bundle_command) do
+      quietly { generator.invoke_all }
+      assert_no_file 'Gemfile'
+    end
   end
 
   def test_skip_bundle
-    generator([destination_root], skip_bundle: true).expects(:bundle_command).never
-    quietly { generator.invoke_all }
-
-    # skip_bundle is only about running bundle install, ensure the Gemfile is still
-    # generated.
-    assert_file 'Gemfile'
+    assert_not_called(generator([destination_root], skip_bundle: true), :bundle_command) do
+      quietly { generator.invoke_all }
+      # skip_bundle is only about running bundle install, ensure the Gemfile is still
+      # generated.
+      assert_file 'Gemfile'
+    end
   end
 
   def test_skip_git