7 files changed, 7 insertions, 11 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index d66fc3fcc9..e6cd055a59 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -27,22 +27,24 @@ module ActionController
     autoload :MimeResponds
     autoload :RackDelegation
     autoload :Redirecting
-    autoload :Rendering
     autoload :Renderers
+    autoload :Rendering
     autoload :RequestForgeryProtection
     autoload :Rescue
     autoload :Responder
     autoload :SessionManagement
     autoload :Streaming
+    autoload :Testing
     autoload :UrlFor
     autoload :Verification
   end
 
   autoload :Dispatcher,      'action_controller/dispatch/dispatcher'
-  autoload :PerformanceTest, 'action_controller/deprecated/performance_test'
-  autoload :Routing,         'action_controller/deprecated'
   autoload :Integration,     'action_controller/deprecated/integration_test'
   autoload :IntegrationTest, 'action_controller/deprecated/integration_test'
+  autoload :PerformanceTest, 'action_controller/deprecated/performance_test'
+  autoload :Routing,         'action_controller/deprecated'
+  autoload :TestCase,        'action_controller/test_case'
 
   eager_autoload do
     autoload :RecordIdentifier
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 398ea52495..155db0af8f 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -1,6 +1,5 @@
 require 'active_support/test_case'
 require 'rack/session/abstract/id'
-require 'action_controller/metal/testing'
 
 module ActionController
   class TestRequest < ActionDispatch::TestRequest #:nodoc:
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 8ce6e82524..93aa69c060 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -52,6 +52,8 @@ module ActionView
     autoload :TemplateHandler,   'action_view/template'
     autoload :TemplateHandlers,  'action_view/template'
   end
+
+  autoload :TestCase, 'action_view/test_case'
 end
 
 require 'action_view/erb/util'
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index be9a2ed50d..1ca427505d 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,5 +1,4 @@
 require 'active_support/test_case'
-require 'action_controller/test_case'
 
 module ActionView
   class Base
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index c1aebefc77..13e4883762 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -20,7 +20,6 @@ require 'action_view/base'
 require 'action_dispatch'
 require 'fixture_template'
 require 'active_support/test_case'
-require 'action_view/test_case'
 require 'active_support/dependencies'
 
 activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 2601765065..696b65f8bf 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -8,10 +8,6 @@ require 'rack/test'
 require 'test/unit'
 require 'active_support/core_ext/kernel/requires'
 
-# AP is always present
-require 'action_controller/test_case'
-require 'action_view/test_case'
-
 require 'action_mailer/test_case' if defined?(ActionMailer)
 require 'active_model/test_case'  if defined?(ActiveModel)
 
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 435bd34925..edab27465e 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -1,6 +1,5 @@
 require 'abstract_unit'
 require 'action_controller'
-require 'action_controller/test_case'
 
 require 'rails/info'
 require 'rails/info_controller'