1 files changed, 5 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index 22e41fa905..78d914f8cf 100644
--- a/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -28,17 +28,22 @@ module ActiveSupport
       end
 
       module ForMiniTest
+        PASSTHROUGH_EXCEPTIONS = MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS rescue [NoMemoryError, SignalException, Interrupt, SystemExit]
         def run(runner)
           result = '.'
           begin
             run_callbacks :setup do
               result = super
             end
+          rescue *PASSTHROUGH_EXCEPTIONS => e
+            raise e
           rescue Exception => e
             result = runner.puke(self.class, method_name, e)
           ensure
             begin
               run_callbacks :teardown
+            rescue *PASSTHROUGH_EXCEPTIONS => e
+              raise e
             rescue Exception => e
               result = runner.puke(self.class, method_name, e)
             end