diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 3b12f16b4db49c85dd23da1e70f7603a1d4b8bac..0d2b4920835a98a1303b684201fc5db622c7a8d6 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Ci::Pipeline, models: true do
+  include EmailHelpers
+
   let(:project) { FactoryGirl.create :empty_project }
   let(:pipeline) { FactoryGirl.create :ci_empty_pipeline, status: 'created', project: project }
 
diff --git a/spec/models/project_services/pipeline_email_service_spec.rb b/spec/models/project_services/pipeline_email_service_spec.rb
index 4f56bceda44c9f2887a9e91dcf63f1a0cdaa0f41..7c8824485f5046eacb26ca45215fc4e5a1d11f7e 100644
--- a/spec/models/project_services/pipeline_email_service_spec.rb
+++ b/spec/models/project_services/pipeline_email_service_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe PipelinesEmailService do
+  include EmailHelpers
+
   let(:pipeline) do
     create(:ci_pipeline, project: project, sha: project.commit('master').sha)
   end
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index ae7994af981512c2a2d45f2bf6c082ca666d07dc..9b52463ba29d89985931f0bcec812f17051c7442 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe API::API, api: true  do
   include ApiHelpers
+  include EmailHelpers
 
   let(:user)        { create(:user) }
   let(:user2)       { create(:user) }
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 4c878d748c0c81a31558cc9c9355c0ffca657f95..500d224ff98434fa39671e17b419ab13aec52e1c 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -2,6 +2,8 @@
 require 'spec_helper'
 
 describe Issues::UpdateService, services: true do
+  include EmailHelpers
+
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:user3) { create(:user) }
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 0bd6db1810a157b77787475e448720a58fed55bd..790ef765f3a1b641faacbf46c9a431a19cf1b78a 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe MergeRequests::UpdateService, services: true do
+  include EmailHelpers
+
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 08ae61708a556060c9157b80def38ec8e5750285..f3e80ac22a07468c0b78a4044cf3f10fb7518402 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe NotificationService, services: true do
+  include EmailHelpers
+
   let(:notification) { NotificationService.new }
 
   around(:each) do |example|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index bead1a006d149118acdd6251576fb8ce53c6f07c..ef33c473d38d8ca28afaa643fa6e51493291e7cf 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -32,7 +32,7 @@ RSpec.configure do |config|
   config.include LoginHelpers, type: :feature
   config.include SearchHelpers, type: :feature
   config.include StubConfiguration
-  config.include EmailHelpers
+  config.include EmailHelpers, type: :mailer
   config.include TestEnv
   config.include ActiveJob::TestHelper
   config.include ActiveSupport::Testing::TimeHelpers
diff --git a/spec/workers/build_email_worker_spec.rb b/spec/workers/build_email_worker_spec.rb
index a1aa336361a3166fbb9424146b185086e897d757..542e674c15015e9b9c6c51863022a6aac5955544 100644
--- a/spec/workers/build_email_worker_spec.rb
+++ b/spec/workers/build_email_worker_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe BuildEmailWorker do
+  include EmailHelpers
   include RepoHelpers
 
   let(:build) { create(:ci_build) }
diff --git a/spec/workers/emails_on_push_worker_spec.rb b/spec/workers/emails_on_push_worker_spec.rb
index fc652f6f4c36cb4180eb6ce69e4e837bbb24fc30..f27e413f7b8ac1aed1ca8b6618a3f8d12d42e921 100644
--- a/spec/workers/emails_on_push_worker_spec.rb
+++ b/spec/workers/emails_on_push_worker_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe EmailsOnPushWorker do
   include RepoHelpers
+  include EmailHelpers
   include EmailSpec::Matchers
 
   let(:project) { create(:project) }
diff --git a/spec/workers/pipeline_notification_worker_spec.rb b/spec/workers/pipeline_notification_worker_spec.rb
index d487a7196800fc7298fb547fd03f6bd4a42aeb43..739f9b639670283788e2ffaad2de069300827e06 100644
--- a/spec/workers/pipeline_notification_worker_spec.rb
+++ b/spec/workers/pipeline_notification_worker_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe PipelineNotificationWorker do
+  include EmailHelpers
+
   let(:pipeline) do
     create(:ci_pipeline,
            project: project,