15 files changed, 6 insertions, 24 deletions
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb
index e8632d4559..318a1e46d1 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -1,6 +1,3 @@
-require 'active_support/test_case'
-require 'action_mailer/base'
-
 module ActionMailer
   class NonInferrableMailerError < ::StandardError
     def initialize(name)
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 155db0af8f..e11e38b20c 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -1,4 +1,3 @@
-require 'active_support/test_case'
 require 'rack/session/abstract/id'
 
 module ActionController
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 2a5f5dcd5c..4ec47d146c 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -1,6 +1,5 @@
 require 'stringio'
 require 'uri'
-require 'active_support/test_case'
 require 'active_support/core_ext/object/metaclass'
 require 'rack/test'
 
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 1ca427505d..16d66b6eca 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,5 +1,3 @@
-require 'active_support/test_case'
-
 module ActionView
   class Base
     alias_method :initialize_without_template_tracking, :initialize
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 13e4883762..27461ce673 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -19,7 +19,6 @@ require 'action_view'
 require 'action_view/base'
 require 'action_dispatch'
 require 'fixture_template'
-require 'active_support/test_case'
 require 'active_support/dependencies'
 
 activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
diff --git a/activemodel/lib/active_model/test_case.rb b/activemodel/lib/active_model/test_case.rb
index 4cb5c9cbc0..6328807ad7 100644
--- a/activemodel/lib/active_model/test_case.rb
+++ b/activemodel/lib/active_model/test_case.rb
@@ -1,5 +1,3 @@
-require "active_support/test_case"
-
 module ActiveModel #:nodoc:
   class TestCase < ActiveSupport::TestCase #:nodoc:
     def with_kcode(kcode)
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 99b812b5fc..9da36a87ec 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -3,7 +3,6 @@ require 'yaml'
 require 'csv'
 require 'zlib'
 require 'active_support/dependencies'
-require 'active_support/test_case'
 require 'active_support/core_ext/logger'
 
 if RUBY_VERSION < '1.9'
diff --git a/activerecord/lib/active_record/test_case.rb b/activerecord/lib/active_record/test_case.rb
index 2dfe2c09ea..0a77ad5fd7 100644
--- a/activerecord/lib/active_record/test_case.rb
+++ b/activerecord/lib/active_record/test_case.rb
@@ -1,5 +1,3 @@
-require "active_support/test_case"
-
 module ActiveRecord
   class TestCase < ActiveSupport::TestCase #:nodoc:
     def assert_date_from_db(expected, actual, message = nil)
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb
index 5fa6d3023b..81e582f5c2 100644
--- a/activeresource/test/abstract_unit.rb
+++ b/activeresource/test/abstract_unit.rb
@@ -10,7 +10,6 @@ require 'rubygems'
 require 'test/unit'
 require 'active_resource'
 require 'active_support'
-require 'active_support/test_case'
 require 'active_model/test_case'
 
 $:.unshift "#{File.dirname(__FILE__)}/../test"
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 3463000529..51ec87f329 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -66,6 +66,8 @@ module ActiveSupport
     autoload :StringInquirer
     autoload :XmlMini
   end
+
+  autoload :TestCase
 end
 
 require 'active_support/vendor'
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index dda139372e..d91e0415c4 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -13,7 +13,6 @@ require 'mocha'
 
 ENV['NO_RELOAD'] = '1'
 require 'active_support'
-require 'active_support/test_case'
 
 # Include shims until we get off 1.8.6
 require 'active_support/ruby/shim'
diff --git a/railties/lib/rails/console_app.rb b/railties/lib/rails/console_app.rb
index 2c4a7a51e8..902a621272 100644
--- a/railties/lib/rails/console_app.rb
+++ b/railties/lib/rails/console_app.rb
@@ -1,5 +1,4 @@
 require 'active_support/all'
-require 'active_support/test_case'
 require 'action_controller'
 
 # work around the at_exit hook in test/unit, which kills IRB
diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb
index 643d7856c5..38a3cbb035 100644
--- a/railties/lib/rails/generators/test_case.rb
+++ b/railties/lib/rails/generators/test_case.rb
@@ -1,4 +1,3 @@
-require 'active_support/test_case'
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'rails/generators'
@@ -76,7 +75,7 @@ module Rails
           eval "$#{stream} = StringIO.new"
           yield
           result = eval("$#{stream}").string
-        ensure 
+        ensure
           eval("$#{stream} = #{stream.upcase}")
         end
 
@@ -137,9 +136,9 @@ module Rails
       #
       #   assert_migration "db/migrate/create_products.rb"
       #
-      # This method manipulates the given path and tries to find any migration which 
+      # This method manipulates the given path and tries to find any migration which
       # matches the migration name. For example, the call above is converted to:
-      # 
+      #
       #   assert_file "db/migrate/003_create_products.rb"
       #
       # Consequently, assert_migration accepts the same arguments has assert_file.
@@ -236,4 +235,4 @@ module Rails
         end
     end
   end
-end
-\ No newline at end of file
+end
diff --git a/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb
index 348ec33582..2ca36a1e44 100644
--- a/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb
+++ b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb
@@ -1,5 +1,3 @@
 require 'rubygems'
 require 'test/unit'
 require 'active_support'
-require 'active_support/test_case'
-
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 2d6983076a..77ef82856a 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -17,7 +17,6 @@ require 'fileutils'
 
 require 'active_support'
 require 'active_support/core_ext/logger'
-require 'active_support/test_case'
 
 require 'action_controller'
 require 'rails/all'