diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 6b34db3e3f..1c0952cc55 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -1,6 +1,8 @@
 activesupport_path = File.expand_path('../../../../activesupport/lib', __FILE__)
 $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
 
+require 'thor/group'
+
 require 'active_support'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/kernel/singleton_class'
@@ -9,8 +11,6 @@ require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
 
-require 'rails/generators/base'
-
 module Rails
   module Generators
     autoload :Actions,         'rails/generators/actions'
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 71f732b16d..dc1d4fa181 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -8,7 +8,6 @@ rescue LoadError
 end
 
 require 'rails/generators'
-require 'rails/generators/actions'
 
 module Rails
   module Generators
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index 813006bf7b..f6f529b80a 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -184,6 +184,7 @@ task default: :test
         end
       end
 
+      public_task :set_default_accessors!
       public_task :create_root
 
       def create_root_files
diff --git a/railties/test/app_rails_loader_test.rb b/railties/test/app_rails_loader_test.rb
index ceae78ae80..92cb3233d8 100644
--- a/railties/test/app_rails_loader_test.rb
+++ b/railties/test/app_rails_loader_test.rb
@@ -22,8 +22,8 @@ class AppRailsLoaderTest < ActiveSupport::TestCase
     exe = "#{script_dir}/rails"
 
     test "is not in a Rails application if #{exe} is not found in the current or parent directories" do
-      File.stubs(:exists?).with('bin/rails').returns(false)
-      File.stubs(:exists?).with('script/rails').returns(false)
+      File.stubs(:exist?).with('bin/rails').returns(false)
+      File.stubs(:exist?).with('script/rails').returns(false)
 
       assert !Rails::AppRailsLoader.exec_app_rails
     end
diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
index 178c505865..ed4559ec6f 100644
--- a/railties/test/paths_test.rb
+++ b/railties/test/paths_test.rb
@@ -3,7 +3,7 @@ require 'rails/paths'
 
 class PathsTest < ActiveSupport::TestCase
   def setup
-    File.stubs(:exists?).returns(true)
+    File.stubs(:exist?).returns(true)
     @root = Rails::Paths::Root.new("/foo/bar")
   end