1 files changed, 9 insertions, 5 deletions
diff --git a/actionmailer/test/tmail_compat_test.rb b/actionmailer/test/tmail_compat_test.rb
index b7fcb3cfea..7c1d9a07c1 100644
--- a/actionmailer/test/tmail_compat_test.rb
+++ b/actionmailer/test/tmail_compat_test.rb
@@ -1,19 +1,23 @@
 require 'abstract_unit'
 
-class TmailCompatTest < Test::Unit::TestCase
+class TmailCompatTest < ActiveSupport::TestCase
 
   def test_set_content_type_raises_deprecation_warning
     mail = Mail.new
-    assert_nothing_raised do
-      mail.set_content_type "text/plain"
+    assert_deprecated do
+      assert_nothing_raised do
+        mail.set_content_type "text/plain"
+      end
     end
     assert_equal mail.mime_type, "text/plain"
   end
 
   def test_transfer_encoding_raises_deprecation_warning
     mail = Mail.new
-    assert_nothing_raised do
-      mail.transfer_encoding "base64"
+    assert_deprecated do
+      assert_nothing_raised do
+        mail.transfer_encoding "base64"
+      end
     end
     assert_equal mail.content_transfer_encoding, "base64"
   end