diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
index f32576a618b8ce82824583b36b94432950847355..33a1c88e33c126e35a4f61efe5a0dff55f704274 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -35,7 +35,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
 
   step 'I have group with projects' do
     @group   = create(:group)
-    @project = create(:project, :repository, namespace: @group)
+    @project = create(:empty_project, namespace: @group)
     @event   = create(:closed_issue_event, project: @project)
 
     @project.team << [current_user, :master]
@@ -54,8 +54,8 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
   end
 
   step 'group has a projects that does not belongs to me' do
-    @forbidden_project1 = create(:project, :repository, group: @group)
-    @forbidden_project2 = create(:project, :repository, group: @group)
+    @forbidden_project1 = create(:empty_project, group: @group)
+    @forbidden_project2 = create(:empty_project, group: @group)
   end
 
   step 'I should see 1 project at group list' do
diff --git a/features/steps/dashboard/issues.rb b/features/steps/dashboard/issues.rb
index 89d015c2ef2d54bd11635cdd16668ceb410d359d..4e15d79ae742ae5221a3cdd6f3f4b27d104cb746 100644
--- a/features/steps/dashboard/issues.rb
+++ b/features/steps/dashboard/issues.rb
@@ -79,13 +79,13 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
 
   def project
     @project ||= begin
-                   project = create(:project, :repository)
+                   project = create(:empty_project)
                    project.team << [current_user, :master]
                    project
                  end
   end
 
   def public_project
-    @public_project ||= create(:project, :public, :repository)
+    @public_project ||= create(:empty_project, :public)
   end
 end
diff --git a/features/steps/group/milestones.rb b/features/steps/group/milestones.rb
index 857f731c3fc71e4dba2e514e47073c8c016de31e..70e23098dde08e68c525e117ac2fd4fe7ee1e673 100644
--- a/features/steps/group/milestones.rb
+++ b/features/steps/group/milestones.rb
@@ -104,7 +104,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
     group = owned_group
 
     %w(gitlabhq gitlab-ci cookbook-gitlab).each do |path|
-      project = create(:project, :repository, path: path, group: group)
+      project = create(:empty_project, path: path, group: group)
       milestone = create :milestone, title: "Version 7.2", project: project
 
       create(:label, project: project, title: 'bug')
diff --git a/features/steps/groups.rb b/features/steps/groups.rb
index b6684226b33eb72d9fcc14494fc66171f4ac1558..4dc87dc4d9c2915defb81b37849995ffc3196f15 100644
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
@@ -109,7 +109,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
 
   step 'Group "Owned" has archived project' do
     group = Group.find_by(name: 'Owned')
-    @archived_project = create(:project, :repository, namespace: group, archived: true, path: "archived-project")
+    @archived_project = create(:empty_project, :archived, namespace: group, path: "archived-project")
   end
 
   step 'I should see "archived" label' do
diff --git a/features/steps/project/deploy_keys.rb b/features/steps/project/deploy_keys.rb
index 894cf77fd89e102159d49897dd64504a5335d957..edf78f62f9a213f21b10ce8abb7243150ea1c6b9 100644
--- a/features/steps/project/deploy_keys.rb
+++ b/features/steps/project/deploy_keys.rb
@@ -46,11 +46,11 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
   end
 
   step 'other projects have deploy keys' do
-    @second_project = create(:project, :repository, namespace: create(:group))
+    @second_project = create(:empty_project, namespace: create(:group))
     @second_project.team << [current_user, :master]
     create(:deploy_keys_project, project: @second_project)
 
-    @third_project = create(:project, :repository, namespace: create(:group))
+    @third_project = create(:empty_project, namespace: create(:group))
     @third_project.team << [current_user, :master]
     create(:deploy_keys_project, project: @third_project, deploy_key: @second_project.deploy_keys.first)
   end
diff --git a/features/steps/project/redirects.rb b/features/steps/project/redirects.rb
index a6a124eed0c0b69e8953972baa85c5cf76237cd9..92936f27c2054ec9b56801698494876d6c872530 100644
--- a/features/steps/project/redirects.rb
+++ b/features/steps/project/redirects.rb
@@ -4,11 +4,11 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
   include SharedProject
 
   step 'public project "Community"' do
-    create(:project, :public, :repository, name: 'Community')
+    create(:empty_project, :public, name: 'Community')
   end
 
   step 'private project "Enterprise"' do
-    create(:project, :repository, name: 'Enterprise')
+    create(:empty_project, :private, name: 'Enterprise')
   end
 
   step 'I visit project "Community" page' do
diff --git a/features/steps/project/team_management.rb b/features/steps/project/team_management.rb
index c84182fe811a38c9f87909b27bbf600d77562bc1..6986c7ede566d4346f90d1e735de4564405adb1c 100644
--- a/features/steps/project/team_management.rb
+++ b/features/steps/project/team_management.rb
@@ -137,7 +137,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
   step 'I share project with group "OpenSource"' do
     project = Project.find_by(name: 'Shop')
     os_group = create(:group, name: 'OpenSource')
-    create(:project, :repository, group: os_group)
+    create(:empty_project, group: os_group)
     @os_user1 = create(:user)
     @os_user2 = create(:user)
     os_group.add_owner(@os_user1)
diff --git a/features/steps/user.rb b/features/steps/user.rb
index cd4ef68151535a93e1225153f2eec6b6ad496a43..271c9b097d409fcac8f96e4d2cdaffbb01e7093a 100644
--- a/features/steps/user.rb
+++ b/features/steps/user.rb
@@ -38,6 +38,6 @@ class Spinach::Features::User < Spinach::FeatureSteps
   end
 
   def contributed_project
-    @contributed_project ||= create(:project, :public, :repository)
+    @contributed_project ||= create(:empty_project, :public)
   end
 end