3 files changed, 14 insertions, 12 deletions
diff --git a/railties/test/rails_generator_test.rb b/railties/test/rails_generator_test.rb
index 9167ba2dd4..0bc1e358fb 100644
--- a/railties/test/rails_generator_test.rb
+++ b/railties/test/rails_generator_test.rb
@@ -26,7 +26,11 @@ end
 
 
 # Must set before requiring generator libs.
-RAILS_ROOT = "#{File.dirname(__FILE__)}/fixtures"
+if defined?(RAILS_ROOT)
+  RAILS_ROOT.replace "#{File.dirname(__FILE__)}/fixtures"
+else
+  RAILS_ROOT = "#{File.dirname(__FILE__)}/fixtures"
+end
 
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'rails_generator'
@@ -88,7 +92,7 @@ class RailsGeneratorTest < Test::Unit::TestCase
     assert_equal 'working', spec.name
     assert_equal "#{RAILS_ROOT}/lib/generators/working", spec.path
     assert_equal :lib, spec.source
-    assert_nothing_raised { assert_match /WorkingGenerator$/, spec.klass.name }
+    assert_nothing_raised { assert_match(/WorkingGenerator$/, spec.klass.name) }
   end
 
   def test_named_generator_attributes
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index e96b4769b2..b73ce5a09a 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -1,15 +1,11 @@
-$:.unshift File.dirname(__FILE__) + "/../lib"
-$:.unshift File.dirname(__FILE__) + "/../builtin/rails_info"
-$:.unshift File.dirname(__FILE__) + "/../../actionpack/lib"
-$:.unshift File.dirname(__FILE__) + "/../../activesupport/lib"
-
-require 'test/unit'
+require "#{File.dirname(__FILE__)}/abstract_unit"
 require 'action_controller'
 require 'action_controller/test_process'
 
 module Rails; end
-require_dependency 'rails/info'
-require_dependency 'rails/info_controller'
+require 'rails/info'
+require 'rails/info_controller'
+
 class Rails::InfoController < ActionController::Base
   @local_request = false
   class << self
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index 338b44884e..33ff25b8c0 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -5,8 +5,10 @@ $:.unshift File.dirname(__FILE__) + "/../../activesupport/lib"
 require 'test/unit'
 require 'active_support'
 
-module Rails
-  class Info; end
+unless defined?(Rails) && defined?(Rails::Info)
+  module Rails
+    class Info; end
+  end
 end
 
 class InfoTest < Test::Unit::TestCase