diff --git a/test/mailers/contact_mailer_test.rb b/test/mailers/contact_mailer_test.rb
index 0eadeccea..a0310748f 100644
--- a/test/mailers/contact_mailer_test.rb
+++ b/test/mailers/contact_mailer_test.rb
@@ -1,11 +1,8 @@
 require 'test_helper'
 
-class ContactMailerTest < ActiveSupport::TestCase
-  include ActionMailer::TestHelper
-
+class ContactMailerTest < ActionMailer::TestCase
   setup do
     @contact = contacts(:john)
-    ActionMailer::Base.deliveries.clear
   end
 
   def test_delivers_email_changed_email
diff --git a/test/mailers/domain_delete_mailer_test.rb b/test/mailers/domain_delete_mailer_test.rb
index 230b3bc7e..e6a39ff3d 100644
--- a/test/mailers/domain_delete_mailer_test.rb
+++ b/test/mailers/domain_delete_mailer_test.rb
@@ -1,11 +1,8 @@
 require 'test_helper'
 
-class DomainDeleteMailerTest < ActiveSupport::TestCase
-  include ActionMailer::TestHelper
-
+class DomainDeleteMailerTest < ActionMailer::TestCase
   setup do
     @domain = domains(:shop)
-    ActionMailer::Base.deliveries.clear
   end
 
   def test_force_delete_templates
diff --git a/test/mailers/domain_expire_mailer_test.rb b/test/mailers/domain_expire_mailer_test.rb
index c2185f8f8..1502bf2f6 100644
--- a/test/mailers/domain_expire_mailer_test.rb
+++ b/test/mailers/domain_expire_mailer_test.rb
@@ -1,12 +1,6 @@
 require 'test_helper'
 
-class DomainExpireMailerTest < ActiveSupport::TestCase
-  include ActionMailer::TestHelper
-
-  setup do
-    ActionMailer::Base.deliveries.clear
-  end
-
+class DomainExpireMailerTest < ActionMailer::TestCase
   def test_delivers_domain_expiration_email
     domain = domains(:shop)
     assert_equal 'shop.test', domain.name
diff --git a/test/mailers/invoice_mailer_test.rb b/test/mailers/invoice_mailer_test.rb
index f84a9d578..8f0941f6d 100644
--- a/test/mailers/invoice_mailer_test.rb
+++ b/test/mailers/invoice_mailer_test.rb
@@ -1,11 +1,8 @@
 require 'test_helper'
 
-class InvoiceMailerTest < ActiveSupport::TestCase
-  include ActionMailer::TestHelper
-
+class InvoiceMailerTest < ActionMailer::TestCase
   setup do
     @invoice = invoices(:one)
-    ActionMailer::Base.deliveries.clear
   end
 
   def test_delivers_invoice_email
diff --git a/test/mailers/registrant_change_mailer_test.rb b/test/mailers/registrant_change_mailer_test.rb
index a4b35499c..5d14972e3 100644
--- a/test/mailers/registrant_change_mailer_test.rb
+++ b/test/mailers/registrant_change_mailer_test.rb
@@ -1,11 +1,8 @@
 require 'test_helper'
 
-class RegistrantChangeMailerTest < ActiveSupport::TestCase
-  include ActionMailer::TestHelper
-
+class RegistrantChangeMailerTest < ActionMailer::TestCase
   setup do
     @domain = domains(:shop)
-    ActionMailer::Base.deliveries.clear
   end
 
   def test_delivers_confirmation_request_email