diff --git a/spec/workers/delete_merged_branches_worker_spec.rb b/spec/workers/delete_merged_branches_worker_spec.rb
index d9497bd486c..39009d9e4b2 100644
--- a/spec/workers/delete_merged_branches_worker_spec.rb
+++ b/spec/workers/delete_merged_branches_worker_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe DeleteMergedBranchesWorker do
   subject(:worker) { described_class.new }
 
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
 
   describe "#perform" do
     it "calls DeleteMergedBranchesService" do
diff --git a/spec/workers/emails_on_push_worker_spec.rb b/spec/workers/emails_on_push_worker_spec.rb
index f27e413f7b8..8cf2b888f9a 100644
--- a/spec/workers/emails_on_push_worker_spec.rb
+++ b/spec/workers/emails_on_push_worker_spec.rb
@@ -5,7 +5,7 @@ describe EmailsOnPushWorker do
   include EmailHelpers
   include EmailSpec::Matchers
 
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:data) { Gitlab::DataBuilder::Push.build_sample(project, user) }
   let(:recipients) { user.email }
diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb
index a60af574a08..029f35512e0 100644
--- a/spec/workers/git_garbage_collect_worker_spec.rb
+++ b/spec/workers/git_garbage_collect_worker_spec.rb
@@ -3,7 +3,7 @@ require 'fileutils'
 require 'spec_helper'
 
 describe GitGarbageCollectWorker do
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let(:shell) { Gitlab::Shell.new }
 
   subject { GitGarbageCollectWorker.new }
diff --git a/spec/workers/group_destroy_worker_spec.rb b/spec/workers/group_destroy_worker_spec.rb
index 4e4eaf9b2f7..1ff5a3b9034 100644
--- a/spec/workers/group_destroy_worker_spec.rb
+++ b/spec/workers/group_destroy_worker_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe GroupDestroyWorker do
   let(:group) { create(:group) }
   let(:user) { create(:admin) }
-  let!(:project) { create(:project, namespace: group) }
+  let!(:project) { create(:empty_project, namespace: group) }
 
   subject { GroupDestroyWorker.new }
 
diff --git a/spec/workers/pipeline_metrics_worker_spec.rb b/spec/workers/pipeline_metrics_worker_spec.rb
index 2d47d93acec..5dbc0da95c2 100644
--- a/spec/workers/pipeline_metrics_worker_spec.rb
+++ b/spec/workers/pipeline_metrics_worker_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe PipelineMetricsWorker do
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let!(:merge_request) { create(:merge_request, source_project: project, source_branch: pipeline.ref) }
 
   let(:pipeline) do
diff --git a/spec/workers/pipeline_notification_worker_spec.rb b/spec/workers/pipeline_notification_worker_spec.rb
index 603ae52ed1e..5a7ce2e08c4 100644
--- a/spec/workers/pipeline_notification_worker_spec.rb
+++ b/spec/workers/pipeline_notification_worker_spec.rb
@@ -11,7 +11,7 @@ describe PipelineNotificationWorker do
            status: status)
   end
 
-  let(:project) { create(:project, public_builds: false) }
+  let(:project) { create(:project, :repository, public_builds: false) }
   let(:user) { create(:user) }
   let(:pusher) { user }
   let(:watcher) { pusher }
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 7bcb5521202..a2a559a2369 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -4,7 +4,7 @@ describe PostReceive do
   let(:changes) { "123456 789012 refs/heads/tést\n654321 210987 refs/tags/tag" }
   let(:wrongly_encoded_changes) { changes.encode("ISO-8859-1").force_encoding("UTF-8") }
   let(:base64_changes) { Base64.encode64(wrongly_encoded_changes) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let(:key) { create(:key, user: project.owner) }
   let(:key_id) { key.shell_id }
 
diff --git a/spec/workers/process_commit_worker_spec.rb b/spec/workers/process_commit_worker_spec.rb
index 75c7fc1efd2..1c383d0514d 100644
--- a/spec/workers/process_commit_worker_spec.rb
+++ b/spec/workers/process_commit_worker_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ProcessCommitWorker do
   let(:worker) { described_class.new }
   let(:user) { create(:user) }
-  let(:project) { create(:project, :public) }
+  let(:project) { create(:project, :public, :repository) }
   let(:issue) { create(:issue, project: project, author: user) }
   let(:commit) { project.commit }
 
diff --git a/spec/workers/project_cache_worker_spec.rb b/spec/workers/project_cache_worker_spec.rb
index f4f63b57a5f..c23ffdf99c0 100644
--- a/spec/workers/project_cache_worker_spec.rb
+++ b/spec/workers/project_cache_worker_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ProjectCacheWorker do
   let(:worker) { described_class.new }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let(:statistics) { project.statistics }
 
   describe '#perform' do
diff --git a/spec/workers/project_destroy_worker_spec.rb b/spec/workers/project_destroy_worker_spec.rb
index 1f4c39eb64a..0ab42f99510 100644
--- a/spec/workers/project_destroy_worker_spec.rb
+++ b/spec/workers/project_destroy_worker_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ProjectDestroyWorker do
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let(:path) { project.repository.path_to_repo }
 
   subject { ProjectDestroyWorker.new }
diff --git a/spec/workers/repository_check/batch_worker_spec.rb b/spec/workers/repository_check/batch_worker_spec.rb
index 27727d6abf9..bcd97a4f6ef 100644
--- a/spec/workers/repository_check/batch_worker_spec.rb
+++ b/spec/workers/repository_check/batch_worker_spec.rb
@@ -4,7 +4,7 @@ describe RepositoryCheck::BatchWorker do
   subject { described_class.new }
 
   it 'prefers projects that have never been checked' do
-    projects = create_list(:project, 3, created_at: 1.week.ago)
+    projects = create_list(:empty_project, 3, created_at: 1.week.ago)
     projects[0].update_column(:last_repository_check_at, 4.months.ago)
     projects[2].update_column(:last_repository_check_at, 3.months.ago)
 
@@ -12,7 +12,7 @@ describe RepositoryCheck::BatchWorker do
   end
 
   it 'sorts projects by last_repository_check_at' do
-    projects = create_list(:project, 3, created_at: 1.week.ago)
+    projects = create_list(:empty_project, 3, created_at: 1.week.ago)
     projects[0].update_column(:last_repository_check_at, 2.months.ago)
     projects[1].update_column(:last_repository_check_at, 4.months.ago)
     projects[2].update_column(:last_repository_check_at, 3.months.ago)
@@ -21,7 +21,7 @@ describe RepositoryCheck::BatchWorker do
   end
 
   it 'excludes projects that were checked recently' do
-    projects = create_list(:project, 3, created_at: 1.week.ago)
+    projects = create_list(:empty_project, 3, created_at: 1.week.ago)
     projects[0].update_column(:last_repository_check_at, 2.days.ago)
     projects[1].update_column(:last_repository_check_at, 2.months.ago)
     projects[2].update_column(:last_repository_check_at, 3.days.ago)
@@ -40,7 +40,7 @@ describe RepositoryCheck::BatchWorker do
   it 'skips projects created less than 24 hours ago' do
     project = create(:empty_project)
     project.update_column(:created_at, 23.hours.ago)
-  
+
     expect(subject.perform).to eq([])
   end
 end
diff --git a/spec/workers/repository_fork_worker_spec.rb b/spec/workers/repository_fork_worker_spec.rb
index 87521ae408e..7d6a2db2972 100644
--- a/spec/workers/repository_fork_worker_spec.rb
+++ b/spec/workers/repository_fork_worker_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe RepositoryForkWorker do
-  let(:project) { create(:project) }
-  let(:fork_project) { create(:project, forked_from_project: project) }
+  let(:project) { create(:project, :repository) }
+  let(:fork_project) { create(:project, :repository, forked_from_project: project) }
   let(:shell) { Gitlab::Shell.new }
 
   subject { RepositoryForkWorker.new }
diff --git a/spec/workers/repository_import_worker_spec.rb b/spec/workers/repository_import_worker_spec.rb
index c42f3147b7a..fbb22439f33 100644
--- a/spec/workers/repository_import_worker_spec.rb
+++ b/spec/workers/repository_import_worker_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe RepositoryImportWorker do
-  let(:project) { create(:project) }
+  let(:project) { create(:empty_project) }
 
   subject { described_class.new }
 
diff --git a/spec/workers/update_merge_requests_worker_spec.rb b/spec/workers/update_merge_requests_worker_spec.rb
index 262d6e5a9ab..558ff9109ec 100644
--- a/spec/workers/update_merge_requests_worker_spec.rb
+++ b/spec/workers/update_merge_requests_worker_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe UpdateMergeRequestsWorker do
   include RepoHelpers
 
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
   subject { described_class.new }