diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb
index edc1c63a0aab3f90f38786fc79f9d8063791f6b7..891df65216d1d46649c798bdcab848a74a8f32da 100644
--- a/spec/features/groups_spec.rb
+++ b/spec/features/groups_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Group' do
+feature 'Group', feature: true do
   describe 'description' do
     let(:group) { create(:group) }
     let(:path)  { group_path(group) }
diff --git a/spec/features/issues/filter_by_milestone_spec.rb b/spec/features/issues/filter_by_milestone_spec.rb
index 284e38a1a09c61dc763bc36b9c28f3851474b1a9..575ce23bb679c2ddf572926746779d7b65af7708 100644
--- a/spec/features/issues/filter_by_milestone_spec.rb
+++ b/spec/features/issues/filter_by_milestone_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-feature 'Issue filtering by Milestone' do
+feature 'Issue filtering by Milestone', feature: true do
   include Select2Helper
 
-  let(:project) { create(:empty_project) }
+  let(:project) { create(:project) }
 
   before do
     login_as(:admin)
diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb
index 046a9f6191df4ed372da3f1b43feec905dfa7d15..cef432e512b8a285c7fb14bc3bdfd51e8d4db78e 100644
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Login' do
+feature 'Login', feature: true do
   describe 'with two-factor authentication' do
     context 'with valid username/password' do
       let(:user) { create(:user, :two_factor) }
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index 902968cebcb6924bec6ced442c707f7840281942..b8199aa5e618fd604c61e4686972e8f977a241e9 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -32,7 +32,7 @@ require 'erb'
 #
 # See the MarkdownFeature class for setup details.
 
-describe 'GitLab Markdown' do
+describe 'GitLab Markdown', feature: true do
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::UrlHelper
   include Capybara::Node::Matchers
diff --git a/spec/features/merge_requests/filter_by_milestone_spec.rb b/spec/features/merge_requests/filter_by_milestone_spec.rb
index 308d8101bdd754c50b9c45bfce14a991a3c6818d..79b226bcd86944bd7ba03f36d5ff5ca3f5ace7fe 100644
--- a/spec/features/merge_requests/filter_by_milestone_spec.rb
+++ b/spec/features/merge_requests/filter_by_milestone_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Merge Request filtering by Milestone' do
+feature 'Merge Request filtering by Milestone', feature: true do
   include Select2Helper
 
   let(:project) { create(:project) }
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index ad37b589b84b6d4f97918cd58a86e558b6d84baf..d7cb3b2e86ead6487a8e965f03168475274c9c96 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Comments' do
+describe 'Comments', feature: true do
   include RepoHelpers
 
   describe 'On a merge request', js: true, feature: true do
diff --git a/spec/features/password_reset_spec.rb b/spec/features/password_reset_spec.rb
index a34efce09ef2ca4b2fe13c1df3230a14207405fc..2b6311e4fd7ae6a2884e9843ba3293129331724b 100644
--- a/spec/features/password_reset_spec.rb
+++ b/spec/features/password_reset_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Password reset' do
+feature 'Password reset', feature: true do
   def forgot_password
     click_on 'Forgot your password?'
     fill_in 'Email', with: user.email
diff --git a/spec/features/profiles/preferences_spec.rb b/spec/features/profiles/preferences_spec.rb
index 03e78c533db2785d246c086276f07ab7cc268774..9bc6145dda4378bcce792a603b254256a7de8d33 100644
--- a/spec/features/profiles/preferences_spec.rb
+++ b/spec/features/profiles/preferences_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Profile > Preferences' do
+describe 'Profile > Preferences', feature: true do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index f8eea70ec4a62e4c7ee389c5bf9a5ccfdd63809c..c8d44efdc8b4d3b9cd5ec483cab556bfb0c2eb47 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Project' do
+feature 'Project', feature: true do
   describe 'description' do
     let(:project) { create(:project) }
     let(:path)    { namespace_project_path(project.namespace, project) }
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index a4c3dfe9205fdc7ebe86979f64f478133210628d..efcb8a31abe64fc0e8f6e12110156c0960521d13 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Users' do
+feature 'Users', feature: true do
   scenario 'GET /users/sign_in creates a new user account' do
     visit new_user_session_path
     fill_in 'user_name', with: 'Name Surname'