7 files changed, 9 insertions, 2 deletions
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index a161188b8e..40d3b17131 100644
--- a/actionpack/test/abstract/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -29,6 +29,7 @@ module AbstractController
     # Test Render mixin
     # ====
     class RenderingController < AbstractController::Base
+      include AbstractController::Rendering
       include ActionView::Rendering
 
       def _prefixes
diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index 555669efa5..a596ebe6f7 100644
--- a/actionpack/test/abstract/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -6,8 +6,9 @@ module AbstractController
   module Testing
 
     class ControllerWithHelpers < AbstractController::Base
-      include ActionView::Rendering
       include AbstractController::Helpers
+      include AbstractController::Rendering
+      include ActionView::Rendering
 
       def with_module
         render :inline => "Module <%= included_method %>"
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index 168e40c610..c79cb50fd7 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -5,6 +5,7 @@ module AbstractControllerTests
 
     # Base controller for these tests
     class Base < AbstractController::Base
+      include AbstractController::Rendering
       include ActionView::Rendering
       include ActionView::Layouts
 
diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb
index 56e5f48825..f9d8c916d9 100644
--- a/actionpack/test/abstract/render_test.rb
+++ b/actionpack/test/abstract/render_test.rb
@@ -4,6 +4,7 @@ module AbstractController
   module Testing
 
     class ControllerRenderer < AbstractController::Base
+      include AbstractController::Rendering
       include ActionView::Rendering
 
       def _prefixes
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index d4e984f998..49dd891e4c 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -271,7 +271,6 @@ end
 module ActionController
   class Base
     include ActionController::Testing
-    include ActionView::Layouts
     # This stub emulates the Railtie including the URL helpers from a Rails application
     include SharedTestRoutes.url_helpers
     include SharedTestRoutes.mounted_helpers
@@ -291,6 +290,7 @@ module ActionController
   end
 end
 
+
 class ::ApplicationController < ActionController::Base
 end
 
diff --git a/actionpack/test/controller/mime/respond_with_test.rb b/actionpack/test/controller/mime/respond_with_test.rb
index 29ddbff8d4..76af9e3414 100644
--- a/actionpack/test/controller/mime/respond_with_test.rb
+++ b/actionpack/test/controller/mime/respond_with_test.rb
@@ -337,6 +337,7 @@ class RespondWithControllerTest < ActionController::TestCase
       errors = { :name => :invalid }
       Customer.any_instance.stubs(:errors).returns(errors)
       put :using_resource
+
       assert_equal "text/html", @response.content_type
       assert_equal 200, @response.status
       assert_equal "Edit world!\n", @response.body
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index fd835795c0..bacc93a936 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -755,6 +755,8 @@ class TestController < ActionController::Base
 end
 
 class MetalTestController < ActionController::Metal
+  include AbstractController::Rendering
+  include ActionView::Rendering
   include ActionController::Rendering
 
   def accessing_logger_in_template