1 files changed, 10 insertions, 2 deletions
diff --git a/actionmailer/test/mail_render_test.rb b/actionmailer/test/mail_render_test.rb
index a725dac4ca..d6ee21a8b9 100644
--- a/actionmailer/test/mail_render_test.rb
+++ b/actionmailer/test/mail_render_test.rb
@@ -45,13 +45,17 @@ end
 
 class RenderHelperTest < Test::Unit::TestCase
   def setup
-    ActionMailer::Base.delivery_method = :test
+    set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
 
     @recipient = 'test@localhost'
   end
 
+  def teardown
+    restore_delivery_method
+  end
+
   def test_inline_template
     mail = RenderMailer.create_inline_template(@recipient)
     assert_equal "Hello, Earth", mail.body.strip
@@ -70,13 +74,17 @@ end
 
 class FirstSecondHelperTest < Test::Unit::TestCase
   def setup
-    ActionMailer::Base.delivery_method = :test
+    set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
 
     @recipient = 'test@localhost'
   end
 
+  def teardown
+    restore_delivery_method
+  end
+
   def test_ordering
     mail = FirstMailer.create_share(@recipient)
     assert_equal "first mail", mail.body.strip