diff --git a/test/mailers/mailer_test.rb b/test/mailers/mailer_test.rb
index 2c167f73..e0f1a5c7 100644
--- a/test/mailers/mailer_test.rb
+++ b/test/mailers/mailer_test.rb
@@ -11,8 +11,7 @@ class MailerTest < ActionMailer::TestCase
       end
     end
 
-    Devise.mailer = TestMailer
-    create_user
+    TestMailer.confirmation_instructions(create_user, "confirmation-token").deliver_now
     mail = ActionMailer::Base.deliveries.first
 
     assert mail.content_transfer_encoding, "7bit"