diff --git a/spec/features/groups/labels/user_sees_links_to_issuables.rb b/spec/features/groups/labels/user_sees_links_to_issuables_spec.rb
similarity index 100%
rename from spec/features/groups/labels/user_sees_links_to_issuables.rb
rename to spec/features/groups/labels/user_sees_links_to_issuables_spec.rb
diff --git a/spec/features/instance_statistics/instance_statistics.rb b/spec/features/instance_statistics/instance_statistics_spec.rb
similarity index 100%
rename from spec/features/instance_statistics/instance_statistics.rb
rename to spec/features/instance_statistics/instance_statistics_spec.rb
diff --git a/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb b/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
similarity index 100%
rename from spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb
rename to spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
diff --git a/spec/features/projects/labels/user_sees_links_to_issuables.rb b/spec/features/projects/labels/user_sees_links_to_issuables_spec.rb
similarity index 100%
rename from spec/features/projects/labels/user_sees_links_to_issuables.rb
rename to spec/features/projects/labels/user_sees_links_to_issuables_spec.rb
diff --git a/spec/features/snippets/user_sees_breadcrumb_links.rb b/spec/features/snippets/user_sees_breadcrumb_links_spec.rb
similarity index 100%
rename from spec/features/snippets/user_sees_breadcrumb_links.rb
rename to spec/features/snippets/user_sees_breadcrumb_links_spec.rb
diff --git a/spec/features/user_opens_link_to_comment.rb b/spec/features/user_opens_link_to_comment_spec.rb
similarity index 100%
rename from spec/features/user_opens_link_to_comment.rb
rename to spec/features/user_opens_link_to_comment_spec.rb
diff --git a/spec/features/users/add_email_to_existing_account.rb b/spec/features/users/add_email_to_existing_account_spec.rb
similarity index 100%
rename from spec/features/users/add_email_to_existing_account.rb
rename to spec/features/users/add_email_to_existing_account_spec.rb
diff --git a/spec/tasks/gitlab/mail_google_schema_whitelisting.rb b/spec/tasks/gitlab/mail_google_schema_whitelisting_spec.rb
similarity index 100%
rename from spec/tasks/gitlab/mail_google_schema_whitelisting.rb
rename to spec/tasks/gitlab/mail_google_schema_whitelisting_spec.rb
diff --git a/spec/views/dashboard/projects/_blank_state_admin_welcome.haml.rb b/spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb
similarity index 100%
rename from spec/views/dashboard/projects/_blank_state_admin_welcome.haml.rb
rename to spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb
diff --git a/spec/views/dashboard/projects/_nav.html.haml.rb b/spec/views/dashboard/projects/_nav.html.haml_spec.rb
similarity index 100%
rename from spec/views/dashboard/projects/_nav.html.haml.rb
rename to spec/views/dashboard/projects/_nav.html.haml_spec.rb
diff --git a/spec/views/projects/deployments/_confirm_rollback_modal_spec.html.rb b/spec/views/projects/deployments/_confirm_rollback_modal_spec.html_spec.rb
similarity index 100%
rename from spec/views/projects/deployments/_confirm_rollback_modal_spec.html.rb
rename to spec/views/projects/deployments/_confirm_rollback_modal_spec.html_spec.rb
diff --git a/spec/views/shared/_label_row.html.haml.rb b/spec/views/shared/_label_row.html.haml_spec.rb
similarity index 100%
rename from spec/views/shared/_label_row.html.haml.rb
rename to spec/views/shared/_label_row.html.haml_spec.rb
diff --git a/spec/views/shared/milestones/_issuable.html.haml.rb b/spec/views/shared/milestones/_issuable.html.haml_spec.rb
similarity index 100%
rename from spec/views/shared/milestones/_issuable.html.haml.rb
rename to spec/views/shared/milestones/_issuable.html.haml_spec.rb
diff --git a/spec/views/shared/milestones/_issuables.html.haml.rb b/spec/views/shared/milestones/_issuables.html.haml_spec.rb
similarity index 100%
rename from spec/views/shared/milestones/_issuables.html.haml.rb
rename to spec/views/shared/milestones/_issuables.html.haml_spec.rb
diff --git a/spec/views/shared/milestones/_top.html.haml.rb b/spec/views/shared/milestones/_top.html.haml_spec.rb
similarity index 100%
rename from spec/views/shared/milestones/_top.html.haml.rb
rename to spec/views/shared/milestones/_top.html.haml_spec.rb