diff --git a/spec/requests/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
similarity index 100%
rename from spec/requests/admin/admin_hooks_spec.rb
rename to spec/features/admin/admin_hooks_spec.rb
diff --git a/spec/requests/admin/admin_projects_spec.rb b/spec/features/admin/admin_projects_spec.rb
similarity index 100%
rename from spec/requests/admin/admin_projects_spec.rb
rename to spec/features/admin/admin_projects_spec.rb
diff --git a/spec/requests/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
similarity index 100%
rename from spec/requests/admin/admin_users_spec.rb
rename to spec/features/admin/admin_users_spec.rb
diff --git a/spec/requests/admin/security_spec.rb b/spec/features/admin/security_spec.rb
similarity index 100%
rename from spec/requests/admin/security_spec.rb
rename to spec/features/admin/security_spec.rb
diff --git a/spec/requests/atom/dashboard_issues_spec.rb b/spec/features/atom/dashboard_issues_spec.rb
similarity index 100%
rename from spec/requests/atom/dashboard_issues_spec.rb
rename to spec/features/atom/dashboard_issues_spec.rb
diff --git a/spec/requests/atom/dashboard_spec.rb b/spec/features/atom/dashboard_spec.rb
similarity index 100%
rename from spec/requests/atom/dashboard_spec.rb
rename to spec/features/atom/dashboard_spec.rb
diff --git a/spec/requests/atom/issues_spec.rb b/spec/features/atom/issues_spec.rb
similarity index 100%
rename from spec/requests/atom/issues_spec.rb
rename to spec/features/atom/issues_spec.rb
diff --git a/spec/requests/gitlab_flavored_markdown_spec.rb b/spec/features/gitlab_flavored_markdown_spec.rb
similarity index 100%
rename from spec/requests/gitlab_flavored_markdown_spec.rb
rename to spec/features/gitlab_flavored_markdown_spec.rb
diff --git a/spec/requests/issues_spec.rb b/spec/features/issues_spec.rb
similarity index 100%
rename from spec/requests/issues_spec.rb
rename to spec/features/issues_spec.rb
diff --git a/spec/requests/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
similarity index 99%
rename from spec/requests/notes_on_merge_requests_spec.rb
rename to spec/features/notes_on_merge_requests_spec.rb
index 0111cf42..37fc85c8 100644
--- a/spec/requests/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -97,7 +97,9 @@ describe "On a merge request diff", js: true, focus: true do
 
     visit diffs_project_merge_request_path(project, merge_request)
 
-    click_link("Diff")
+    within '.diffs-tab' do
+      click_link("Diff")
+    end
   end
 
   subject { page }
diff --git a/spec/requests/notes_on_wall_spec.rb b/spec/features/notes_on_wall_spec.rb
similarity index 100%
rename from spec/requests/notes_on_wall_spec.rb
rename to spec/features/notes_on_wall_spec.rb
diff --git a/spec/requests/profile_spec.rb b/spec/features/profile_spec.rb
similarity index 100%
rename from spec/requests/profile_spec.rb
rename to spec/features/profile_spec.rb
diff --git a/spec/requests/projects_deploy_keys_spec.rb b/spec/features/projects_deploy_keys_spec.rb
similarity index 100%
rename from spec/requests/projects_deploy_keys_spec.rb
rename to spec/features/projects_deploy_keys_spec.rb
diff --git a/spec/requests/projects_spec.rb b/spec/features/projects_spec.rb
similarity index 100%
rename from spec/requests/projects_spec.rb
rename to spec/features/projects_spec.rb
diff --git a/spec/requests/search_spec.rb b/spec/features/search_spec.rb
similarity index 100%
rename from spec/requests/search_spec.rb
rename to spec/features/search_spec.rb
diff --git a/spec/requests/security/profile_access_spec.rb b/spec/features/security/profile_access_spec.rb
similarity index 100%
rename from spec/requests/security/profile_access_spec.rb
rename to spec/features/security/profile_access_spec.rb
diff --git a/spec/requests/security/project_access_spec.rb b/spec/features/security/project_access_spec.rb
similarity index 100%
rename from spec/requests/security/project_access_spec.rb
rename to spec/features/security/project_access_spec.rb
diff --git a/spec/requests/snippets_spec.rb b/spec/features/snippets_spec.rb
similarity index 100%
rename from spec/requests/snippets_spec.rb
rename to spec/features/snippets_spec.rb