2 files changed, 12 insertions, 2 deletions
diff --git a/railties/test/railties/generators_test.rb b/railties/test/railties/generators_test.rb
index fe59dcd52b..1d4ba0e5b6 100644
--- a/railties/test/railties/generators_test.rb
+++ b/railties/test/railties/generators_test.rb
@@ -1,7 +1,8 @@
 RAILS_ISOLATED_ENGINE = true
 require "isolation/abstract_unit"
 
-require "#{RAILS_FRAMEWORK_ROOT}/railties/lib/rails/generators/test_case"
+require 'generators/generators_test_helper'
+require "rails/generators/test_case"
 
 module RailtiesTests
   class GeneratorTest < Rails::Generators::TestCase
@@ -31,8 +32,8 @@ module RailtiesTests
     end
 
     def build_engine(is_mountable=false)
+      FileUtils.rm_rf(engine_path)
       FileUtils.mkdir_p(engine_path)
-      FileUtils.rm_r(engine_path)
 
       mountable = is_mountable ? "--mountable" : ""
 
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index 8cbc76db71..9a64b7c64e 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -84,6 +84,15 @@ module RailtiesTest
       end
     end
 
+    def test_no_rake_task_without_migrations
+      boot_rails
+      require 'rake'
+      require 'rdoc/task'
+      require 'rake/testtask'
+      Rails.application.load_tasks
+      assert !Rake::Task.task_defined?('bukkits:install:migrations')
+    end
+
     def test_puts_its_lib_directory_on_load_path
       boot_rails
       require "another"