1 files changed, 2 insertions, 5 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 3585432ec75..8dc5e0b34d2 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -1096,12 +1096,9 @@ describe Notify do
   end
 
   describe 'email has correct subject' do
-    let(:gitlab_subject_suffix) { Gitlab.config.gitlab.email_subject_suffix }
-
     it 'has correct suffix' do
-      if gitlab_subject_suffix.length > 0
-        is_expected.to have_subject gitlab_subject_suffix
-      end
+      stub_config_setting(email_subject_suffix: 'A Nice Suffix')
+      is_expected.to have_subject /\| A Nice Suffix$/
     end
   end
 end