1 files changed, 1 insertions, 10 deletions
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 57c97a326c..b3a8e8750b 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -613,18 +613,9 @@ class InferringClassNameTest < Test::Unit::TestCase
     end
 end
 
-class ContentControllerTest < ActionController::TestCase
-  def setup
-    # Should not override ActionController setup methods
-  end
-
-  def test_should_still_setup_controller
-    assert_kind_of(ContentController, @controller)
-  end
-end
-
 class CrazyNameTest < ActionController::TestCase
   tests ContentController
+
   def test_controller_class_can_be_set_manually_not_just_inferred
     assert_equal ContentController, self.class.controller_class
   end