diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
deleted file mode 100644
index a33c6b096c..0000000000
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ /dev/null
@@ -1,332 +0,0 @@
-require 'generators/generators_test_helper'
-require 'rails/generators/rails/plugin_new/plugin_new_generator'
-require 'generators/shared_generator_tests.rb'
-
-DEFAULT_PLUGIN_FILES = %w(
-  .gitignore
-  Gemfile
-  Rakefile
-  README.rdoc
-  bukkits.gemspec
-  MIT-LICENSE
-  lib
-  lib/bukkits.rb
-  lib/tasks/bukkits_tasks.rake
-  lib/bukkits/version.rb
-  test/bukkits_test.rb
-  test/test_helper.rb
-  test/dummy
-)
-
-class PluginNewGeneratorTest < Rails::Generators::TestCase
-  include GeneratorsTestHelper
-  destination File.join(Rails.root, "tmp/bukkits")
-  arguments [destination_root]
-
-  # brings setup, teardown, and some tests
-  include SharedGeneratorTests
-
-  def test_invalid_plugin_name_raises_an_error
-    content = capture(:stderr){ run_generator [File.join(destination_root, "43-things")] }
-    assert_equal "Invalid plugin name 43-things. Please give a name which does not start with numbers.\n", content
-  end
-
-  def test_invalid_plugin_name_is_fixed
-    run_generator [File.join(destination_root, "things-43")]
-    assert_file "things-43/lib/things-43.rb", /module Things43/
-  end
-
-  def test_camelcase_plugin_name_underscores_filenames
-    run_generator [File.join(destination_root, "CamelCasedName")]
-    assert_no_file "CamelCasedName/lib/CamelCasedName.rb"
-    assert_file "CamelCasedName/lib/camel_cased_name.rb", /module CamelCasedName/
-  end
-
-  def test_generating_without_options
-    run_generator
-    assert_file "README.rdoc", /Bukkits/
-    assert_no_file "config/routes.rb"
-    assert_file "test/test_helper.rb"
-    assert_file "test/bukkits_test.rb", /assert_kind_of Module, Bukkits/
-  end
-
-  def test_generating_test_files_in_full_mode
-    run_generator [destination_root, "--full"]
-    assert_directory "test/integration/"
-
-    assert_file "test/integration/navigation_test.rb", /ActionDispatch::IntegrationTest/
-  end
-
-  def test_generating_test_files_in_full_mode_without_unit_test_files
-    run_generator [destination_root, "-T", "--full"]
-
-    assert_no_directory "test/integration/"
-    assert_no_file "test"
-    assert_no_match(/APP_RAKEFILE/, File.read(File.join(destination_root, "Rakefile")))
-  end
-
-  def test_generating_adds_dummy_app_rake_tasks_without_unit_test_files
-    run_generator [destination_root, "-T", "--mountable", '--dummy-path', 'my_dummy_app']
-
-    assert_match(/APP_RAKEFILE/, File.read(File.join(destination_root, "Rakefile")))
-  end
-
-  def test_ensure_that_plugin_options_are_not_passed_to_app_generator
-    FileUtils.cd(Rails.root)
-    assert_no_match(/It works from file!.*It works_from_file/, run_generator([destination_root, "-m", "lib/template.rb"]))
-  end
-
-  def test_ensure_that_test_dummy_can_be_generated_from_a_template
-    FileUtils.cd(Rails.root)
-    run_generator([destination_root, "-m", "lib/create_test_dummy_template.rb", "--skip-test-unit"])
-    assert_file "spec/dummy"
-    assert_no_file "test"
-  end
-
-  def test_database_entry_is_generated_for_sqlite3_by_default_in_full_mode
-    run_generator([destination_root, "--full"])
-    assert_file "test/dummy/config/database.yml", /sqlite/
-    assert_file "bukkits.gemspec", /sqlite3/
-  end
-
-  def test_config_another_database
-    run_generator([destination_root, "-d", "mysql", "--full"])
-    assert_file "test/dummy/config/database.yml", /mysql/
-    assert_file "bukkits.gemspec", /mysql/
-  end
-
-  def test_dont_generate_development_dependency
-    run_generator [destination_root, "--skip-active-record"]
-
-    assert_file "bukkits.gemspec" do |contents|
-      assert_no_match(/s.add_development_dependency "sqlite3"/, contents)
-    end
-  end
-
-  def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given
-    run_generator [destination_root, "--skip-active-record"]
-    assert_file "test/dummy/config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
-  end
-
-  def test_ensure_that_skip_active_record_option_is_passed_to_app_generator
-    run_generator [destination_root, "--skip_active_record"]
-    assert_no_file "test/dummy/config/database.yml"
-    assert_no_match(/ActiveRecord/, File.read(File.join(destination_root, "test/test_helper.rb")))
-  end
-
-  def test_ensure_that_database_option_is_passed_to_app_generator
-    run_generator [destination_root, "--database", "postgresql"]
-    assert_file "test/dummy/config/database.yml", /postgres/
-  end
-
-  def test_generation_runs_bundle_install_with_full_and_mountable
-    result = run_generator [destination_root, "--mountable", "--full"]
-    assert_equal 1, result.scan("Your bundle is complete").size
-  end
-
-  def test_skipping_javascripts_without_mountable_option
-    run_generator
-    assert_no_file "app/assets/javascripts/bukkits/application.js"
-    assert_no_file "vendor/assets/javascripts/jquery.js"
-    assert_no_file "vendor/assets/javascripts/jquery_ujs.js"
-  end
-
-  def test_javascripts_generation
-    run_generator [destination_root, "--mountable"]
-    assert_file "app/assets/javascripts/bukkits/application.js"
-  end
-
-  def test_jquery_is_the_default_javascript_library
-    run_generator [destination_root, "--mountable"]
-    assert_file "app/assets/javascripts/bukkits/application.js" do |contents|
-      assert_match %r{^//= require jquery}, contents
-      assert_match %r{^//= require jquery_ujs}, contents
-    end
-    assert_file 'bukkits.gemspec' do |contents|
-      assert_match(/jquery-rails/, contents)
-    end
-  end
-
-  def test_other_javascript_libraries
-    run_generator [destination_root, "--mountable", '-j', 'prototype']
-    assert_file "app/assets/javascripts/bukkits/application.js" do |contents|
-      assert_match %r{^//= require prototype}, contents
-      assert_match %r{^//= require prototype_ujs}, contents
-    end
-    assert_file 'bukkits.gemspec' do |contents|
-      assert_match(/prototype-rails/, contents)
-    end
-  end
-
-  def test_skip_javascripts
-    run_generator [destination_root, "--skip-javascript", "--mountable"]
-    assert_no_file "app/assets/javascripts/bukkits/application.js"
-    assert_no_file "vendor/assets/javascripts/jquery.js"
-    assert_no_file "vendor/assets/javascripts/jquery_ujs.js"
-  end
-
-  def test_template_from_dir_pwd
-    FileUtils.cd(Rails.root)
-    assert_match(/It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"]))
-  end
-
-  def test_ensure_that_tests_work
-    run_generator
-    FileUtils.cd destination_root
-    quietly { system 'bundle install' }
-    assert_match(/1 tests, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`)
-  end
-
-  def test_ensure_that_tests_works_in_full_mode
-    run_generator [destination_root, "--full", "--skip_active_record"]
-    FileUtils.cd destination_root
-    quietly { system 'bundle install' }
-    assert_match(/1 tests, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`)
-  end
-
-  def test_ensure_that_migration_tasks_work_with_mountable_option
-    run_generator [destination_root, "--mountable"]
-    FileUtils.cd destination_root
-    quietly { system 'bundle install' }
-    `bundle exec rake db:migrate`
-    assert_equal 0, $?.exitstatus
-  end
-
-  def test_creating_engine_in_full_mode
-    run_generator [destination_root, "--full"]
-    assert_file "app/assets/javascripts/bukkits"
-    assert_file "app/assets/stylesheets/bukkits"
-    assert_file "app/assets/images/bukkits"
-    assert_file "app/models"
-    assert_file "app/controllers"
-    assert_file "app/views"
-    assert_file "app/helpers"
-    assert_file "app/mailers"
-    assert_file "config/routes.rb", /Rails.application.routes.draw do/
-    assert_file "lib/bukkits/engine.rb", /module Bukkits\n  class Engine < ::Rails::Engine\n  end\nend/
-    assert_file "lib/bukkits.rb", /require "bukkits\/engine"/
-    assert_file "script/rails"
-  end
-
-  def test_being_quiet_while_creating_dummy_application
-    assert_no_match(/create\s+config\/application.rb/, run_generator)
-  end
-
-  def test_create_mountable_application_with_mountable_option
-    run_generator [destination_root, "--mountable"]
-    assert_file "app/assets/javascripts/bukkits"
-    assert_file "app/assets/stylesheets/bukkits"
-    assert_file "app/assets/images/bukkits"
-    assert_file "config/routes.rb", /Bukkits::Engine.routes.draw do/
-    assert_file "lib/bukkits/engine.rb", /isolate_namespace Bukkits/
-    assert_file "test/dummy/config/routes.rb", /mount Bukkits::Engine => "\/bukkits"/
-    assert_file "app/controllers/bukkits/application_controller.rb", /module Bukkits\n  class ApplicationController < ActionController::Base/
-    assert_file "app/helpers/bukkits/application_helper.rb", /module Bukkits\n  module ApplicationHelper/
-    assert_file "app/views/layouts/bukkits/application.html.erb" do |contents|
-      assert_match "<title>Bukkits</title>", contents
-      assert_match(/stylesheet_link_tag\s+['"]bukkits\/application['"]/, contents)
-      assert_match(/javascript_include_tag\s+['"]bukkits\/application['"]/, contents)
-    end
-  end
-
-  def test_creating_gemspec
-    run_generator
-    assert_file "bukkits.gemspec", /s.name\s+= "bukkits"/
-    assert_file "bukkits.gemspec", /s.files = Dir\["\{app,config,db,lib\}\/\*\*\/\*"\]/
-    assert_file "bukkits.gemspec", /s.test_files = Dir\["test\/\*\*\/\*"\]/
-    assert_file "bukkits.gemspec", /s.version\s+ = Bukkits::VERSION/
-  end
-
-  def test_usage_of_engine_commands
-    run_generator [destination_root, "--full"]
-    assert_file "script/rails", /ENGINE_PATH = File.expand_path\('..\/..\/lib\/bukkits\/engine', __FILE__\)/
-    assert_file "script/rails", /ENGINE_ROOT = File.expand_path\('..\/..', __FILE__\)/
-    assert_file "script/rails", /require 'rails\/all'/
-    assert_file "script/rails", /require 'rails\/engine\/commands'/
-  end
-
-  def test_shebang
-    run_generator [destination_root, "--full"]
-    assert_file "script/rails", /#!\/usr\/bin\/env ruby/
-  end
-
-  def test_passing_dummy_path_as_a_parameter
-    run_generator [destination_root, "--dummy_path", "spec/dummy"]
-    assert_file "spec/dummy"
-    assert_file "spec/dummy/config/application.rb"
-    assert_no_file "test/dummy"
-  end
-
-  def test_creating_dummy_without_tests_but_with_dummy_path
-    run_generator [destination_root, "--dummy_path", "spec/dummy", "--skip-test-unit"]
-    assert_file "spec/dummy"
-    assert_file "spec/dummy/config/application.rb"
-    assert_no_file "test"
-  end
-  
-  def test_ensure_that_gitignore_can_be_generated_from_a_template_for_dummy_path
-    FileUtils.cd(Rails.root)
-    run_generator([destination_root, "--dummy_path", "spec/dummy" "--skip-test-unit"])
-    assert_file ".gitignore" do |contents|
-      assert_match(/spec\/dummy/, contents)
-    end
-  end
-
-  def test_skipping_test_unit
-    run_generator [destination_root, "--skip-test-unit"]
-    assert_no_file "test"
-    assert_file "bukkits.gemspec" do |contents|
-      assert_no_match(/s.test_files = Dir\["test\/\*\*\/\*"\]/, contents)
-    end
-  end
-
-  def test_skipping_gemspec
-    run_generator [destination_root, "--skip-gemspec"]
-    assert_no_file "bukkits.gemspec"
-  end
-
-protected
-  def action(*args, &block)
-    silence(:stdout){ generator.send(*args, &block) }
-  end
-
-  def default_files
-    ::DEFAULT_PLUGIN_FILES
-  end
-end
-
-class CustomPluginGeneratorTest < Rails::Generators::TestCase
-  include GeneratorsTestHelper
-  tests Rails::Generators::PluginNewGenerator
-
-  destination File.join(Rails.root, "tmp/bukkits")
-  arguments [destination_root]
-  include SharedCustomGeneratorTests
-
-  def test_overriding_test_framework
-    FileUtils.cd(destination_root)
-    run_generator([destination_root, "-b", "#{Rails.root}/lib/plugin_builders/spec_builder.rb"])
-    assert_file 'spec/spec_helper.rb'
-    assert_file 'spec/dummy'
-    assert_file 'Rakefile', /task :default => :spec/
-    assert_file 'Rakefile', /# spec tasks in rakefile/
-  end
-
-protected
-  def default_files
-    ::DEFAULT_PLUGIN_FILES
-  end
-
-  def builder_class
-    :PluginBuilder
-  end
-
-  def builders_dir
-    "plugin_builders"
-  end
-
-  def action(*args, &block)
-    silence(:stdout){ generator.send(*args, &block) }
-  end
-end
-