diff --git a/features/support/env.rb b/features/support/env.rb
index 7c8a4aa937322e33ca97054f9500990200f1a397..1693a588993f32a315316c94f556e73681c8e225 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -35,7 +35,7 @@ Capybara.ignore_hidden_elements = false
 DatabaseCleaner.strategy = :truncation
 
 Spinach.hooks.before_scenario do
-  TestEnv.init
+  TestEnv.init(mailer: false)
 
   DatabaseCleaner.start
 end
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 5358143c62be7acc7bdbc945bd78d6057f4ba4c4..175698ac9c97fa6b39e06b09d9f1ffcfe3cab42f 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -21,6 +21,10 @@ module TestEnv
     #
     disable_observers if opts[:observers] == false
 
+    # Disable mailer for spinach tests
+    disable_mailer if opts[:mailer] == false
+
+
     # Use tmp dir for FS manipulations
     repos_path = Rails.root.join('tmp', 'test-git-base-path')
     Gitlab.config.gitlab_shell.stub(repos_path: repos_path)
@@ -76,4 +80,8 @@ module TestEnv
   def disable_observers
     ActiveRecord::Base.observers.disable(:all)
   end
+
+  def disable_mailer
+    ActionMailer::Base.perform_deliveries = false
+  end
 end