3 files changed, 4 insertions, 4 deletions
diff --git a/qa/qa/page/merge_request/new.rb b/qa/qa/page/merge_request/new.rb
index 20d9c336367..56fbf59b9bc 100644
--- a/qa/qa/page/merge_request/new.rb
+++ b/qa/qa/page/merge_request/new.rb
@@ -26,7 +26,7 @@ module QA
           element :issuable_label
         end
 
-        view 'app/views/shared/issuable/form/_metadata_merge_request_assignee.html.haml' do
+        view 'app/views/shared/issuable/form/_metadata_issuable_assignee.html.haml' do
           element :assign_to_me_link
         end
 
diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
index bb1f775da75..0971e551db1 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
+++ b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
@@ -40,7 +40,7 @@ module QA
           Resource::CiVariable.fabricate! do |resource|
             resource.project = @project
             resource.key = 'K8S_SECRET_OPTIONAL_MESSAGE'
-            resource.value = 'You can see this application secret'
+            resource.value = 'you_can_see_this_variable'
           end
 
           # Connect K8s cluster
@@ -99,7 +99,7 @@ module QA
           Page::Project::Operations::Environments::Show.perform do |show|
             show.view_deployment do
               expect(page).to have_content('Hello World!')
-              expect(page).to have_content('You can see this application secret')
+              expect(page).to have_content('you_can_see_this_variable')
             end
           end
         end
diff --git a/qa/spec/spec_helper.rb b/qa/spec/spec_helper.rb
index be13c3fb683..a235fddabca 100644
--- a/qa/spec/spec_helper.rb
+++ b/qa/spec/spec_helper.rb
@@ -34,7 +34,7 @@ RSpec.configure do |config|
   config.display_try_failure_messages = true
 
   config.around do |example|
-    retry_times = example.metadata.keys.include?(:quarantine) ? 1 : 3
+    retry_times = example.metadata.keys.include?(:quarantine) ? 1 : 2
     example.run_with_retry retry: retry_times
   end
 end