1 files changed, 1 insertions, 13 deletions
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index 97773dc2c0..7952eb50c3 100644
--- a/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -3,9 +3,7 @@ module ActiveSupport
     module SetupAndTeardown
       def self.included(base)
         base.class_eval do
-          extend ClassMethods
-
-          include ActiveSupport::Callbacks
+          include ActiveSupport::DeprecatedCallbacks
           define_callbacks :setup, :teardown
 
           if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
@@ -16,16 +14,6 @@ module ActiveSupport
         end
       end
 
-      module ClassMethods
-        def setup(*args, &block)
-          set_callback(:setup, *args, &block)
-        end
-
-        def teardown(*args, &block)
-          set_callback(:teardown, *args, &block)
-        end
-      end
-
       module ForMiniTest
         def run(runner)
           result = '.'