3 files changed, 7 insertions, 2 deletions
diff --git a/railties/test/plugin_locator_test.rb b/railties/test/plugin_locator_test.rb
index 855ac7d82f..da1548dee1 100644
--- a/railties/test/plugin_locator_test.rb
+++ b/railties/test/plugin_locator_test.rb
@@ -27,7 +27,8 @@ class PluginFileSystemLocatorTest < Test::Unit::TestCase
     # We need to add our testing plugin directory to the plugin paths so
     # the locator knows where to look for our plugins
     @configuration.plugin_paths << plugin_fixture_root_path
-    @initializer       = Rails::Initializer.new(@configuration)
+    @initializer       = Rails::Initializer.default
+    @initializer.config = @configuration
     @locator           = Rails::Plugin::FileSystemLocator.new(@initializer)
     @valid_plugin_path = plugin_fixture_path('default/stubby')
     @empty_plugin_path = plugin_fixture_path('default/empty')
diff --git a/railties/test/plugin_test.rb b/railties/test/plugin_test.rb
index a6c390a45a..ae03ea4662 100644
--- a/railties/test/plugin_test.rb
+++ b/railties/test/plugin_test.rb
@@ -2,7 +2,8 @@ require 'plugin_test_helper'
 
 class PluginTest < Test::Unit::TestCase
   def setup
-    @initializer         = Rails::Initializer.new(Rails::Configuration.new)
+    @initializer         = Rails::Initializer.default
+    @initializer.config  = Rails::Configuration.new
     @valid_plugin_path   = plugin_fixture_path('default/stubby')
     @empty_plugin_path   = plugin_fixture_path('default/empty')
     @gemlike_plugin_path = plugin_fixture_path('default/gemlike')
diff --git a/railties/test/rails_generator_test.rb b/railties/test/rails_generator_test.rb
index b2fc2f585d..38bd90dcc1 100644
--- a/railties/test/rails_generator_test.rb
+++ b/railties/test/rails_generator_test.rb
@@ -50,6 +50,9 @@ class RailsGeneratorTest < Test::Unit::TestCase
 
   def setup
     ActiveRecord::Base.pluralize_table_names = true
+    @initializer = Rails::Initializer.default
+    @initializer.config = Rails.configuration
+    @initializer.run(:set_root_path)
   end
 
   def test_sources