diff --git a/lib/minitest/test.rb b/lib/minitest/test.rb
index 6510e09..5e776fc 100644
--- a/lib/minitest/test.rb
+++ b/lib/minitest/test.rb
@@ -84,6 +84,8 @@ module Minitest
       :random
     end
 
+    SETUP_METHODS = %w[ before_setup setup after_setup ] # :nodoc:
+
     TEARDOWN_METHODS = %w[ before_teardown teardown after_teardown ] # :nodoc:
 
     ##
@@ -93,7 +95,9 @@ module Minitest
       with_info_handler do
         time_it do
           capture_exceptions do
-            before_setup; setup; after_setup
+            SETUP_METHODS.each do |hook|
+              self.send hook
+            end
 
             self.send self.name
           end