diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb
index d15dff1b52b..0e5ae724bf7 100644
--- a/spec/services/issues/close_service_spec.rb
+++ b/spec/services/issues/close_service_spec.rb
@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Issues::CloseService do
-  let(:project) { create(:empty_project) }
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:issue) { create(:issue, assignee: user2) }
+  let(:project) { issue.project }
 
   before do
     project.team << [user, :master]
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 22b89bec96d..6fc69e93628 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe Issues::UpdateService do
-  let(:project) { create(:empty_project) }
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:issue) { create(:issue) }
   let(:label) { create(:label) }
+  let(:project) { issue.project }
 
   before do
     project.team << [user, :master]
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 2a54b2e920a..62a99d15952 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -31,7 +31,8 @@ describe NotificationService do
 
   describe 'Notes' do
     context 'issue note' do
-      let(:issue) { create(:issue, assignee: create(:user)) }
+      let(:project) { create(:empty_project, :public) }
+      let(:issue) { create(:issue, project: project, assignee: create(:user)) }
       let(:mentioned_issue) { create(:issue, assignee: issue.assignee) }
       let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: '@mention referenced') }
 
@@ -101,7 +102,8 @@ describe NotificationService do
     end
 
     context 'issue note mention' do
-      let(:issue) { create(:issue, assignee: create(:user)) }
+      let(:project) { create(:empty_project, :public) }
+      let(:issue) { create(:issue, project: project, assignee: create(:user)) }
       let(:mentioned_issue) { create(:issue, assignee: issue.assignee) }
       let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: '@all mentioned') }
 
@@ -145,7 +147,8 @@ describe NotificationService do
     end
 
     context 'commit note' do
-      let(:note) { create(:note_on_commit) }
+      let(:project) { create(:project, :public) }
+      let(:note) { create(:note_on_commit, project: project) }
 
       before do
         build_team(note.project)
@@ -192,7 +195,8 @@ describe NotificationService do
   end
 
   describe 'Issues' do
-    let(:issue) { create :issue, assignee: create(:user), description: 'cc @participant' }
+    let(:project) { create(:empty_project, :public) }
+    let(:issue) { create :issue, project: project, assignee: create(:user), description: 'cc @participant' }
 
     before do
       build_team(issue.project)
@@ -295,7 +299,8 @@ describe NotificationService do
   end
 
   describe 'Merge Requests' do
-    let(:merge_request) { create :merge_request, assignee: create(:user) }
+    let(:project) { create(:project, :public) }
+    let(:merge_request) { create :merge_request, source_project: project, assignee: create(:user) }
 
     before do
       build_team(merge_request.target_project)