diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml
index cb8c22ff076..38607ffca1c 100644
--- a/app/views/admin/application_settings/show.html.haml
+++ b/app/views/admin/application_settings/show.html.haml
@@ -169,7 +169,7 @@
   .settings-content
     = render 'logging'
 
-%section.settings.as-repository-storage.no-animate#js-repository-storage-settings{ class: ('expanded' if expanded) }
+%section.qa-repository-storage-settings.settings.as-repository-storage.no-animate#js-repository-storage-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
       = _('Repository storage')
diff --git a/app/views/projects/deploy_keys/_index.html.haml b/app/views/projects/deploy_keys/_index.html.haml
index 6af57d3ab26..fb1ea471dec 100644
--- a/app/views/projects/deploy_keys/_index.html.haml
+++ b/app/views/projects/deploy_keys/_index.html.haml
@@ -1,5 +1,5 @@
 - expanded = Rails.env.test?
-%section.settings.no-animate{ class: ('expanded' if expanded) }
+%section.qa-deploy-keys-settings.settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
       Deploy Keys
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 77665a2ac23..9f175d2376f 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -82,7 +82,7 @@
 
   = render_if_exists 'projects/issues_settings'
 
-  %section.settings.merge-requests-feature.no-animate{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:merge_requests_access_level) == 0)] }
+  %section.qa-merge-request-settings.settings.merge-requests-feature.no-animate{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:merge_requests_access_level) == 0)] }
     .settings-header
       %h4
         Merge request
@@ -101,7 +101,7 @@
 
   = render 'export', project: @project
 
-  %section.settings.advanced-settings.no-animate{ class: ('expanded' if expanded) }
+  %section.qa-advanced-settings.settings.advanced-settings.no-animate{ class: ('expanded' if expanded) }
     .settings-header
       %h4
         Advanced
diff --git a/app/views/projects/protected_branches/shared/_index.html.haml b/app/views/projects/protected_branches/shared/_index.html.haml
index 846f8858d14..4f1c6c92484 100644
--- a/app/views/projects/protected_branches/shared/_index.html.haml
+++ b/app/views/projects/protected_branches/shared/_index.html.haml
@@ -1,6 +1,6 @@
 - expanded = Rails.env.test?
 
-%section.settings.no-animate{ class: ('expanded' if expanded) }
+%section.qa-protected-branches-settings.settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
       Protected Branches
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index 3047207bca7..56c175f5649 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -16,7 +16,7 @@
   .settings-content
     = render 'form'
 
-%section.settings#autodevops-settings.no-animate{ class: ('expanded' if expanded) }
+%section.qa-autodevops-settings.settings#autodevops-settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
       = s_('CICD|Auto DevOps')
@@ -28,7 +28,7 @@
   .settings-content
     = render 'autodevops_form'
 
-%section.settings.no-animate{ class: ('expanded' if expanded) }
+%section.qa-runners-settings.settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
       Runners
@@ -39,7 +39,7 @@
   .settings-content
     = render 'projects/runners/index'
 
-%section.settings.no-animate{ class: ('expanded' if expanded) }
+%section.qa-variables-settings.settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
       = _('Variables')
diff --git a/qa/qa/page/admin/settings/main.rb b/qa/qa/page/admin/settings/main.rb
index e7c1220c967..db3387b4557 100644
--- a/qa/qa/page/admin/settings/main.rb
+++ b/qa/qa/page/admin/settings/main.rb
@@ -6,11 +6,11 @@ module QA
           include QA::Page::Settings::Common
 
           view 'app/views/admin/application_settings/show.html.haml' do
-            element :advanced_settings_section, 'Repository storage'
+            element :repository_storage_settings
           end
 
           def expand_repository_storage(&block)
-            expand_section('Repository storage') do
+            expand_section(:repository_storage_settings) do
               RepositoryStorage.perform(&block)
             end
           end
diff --git a/qa/qa/page/project/settings/advanced.rb b/qa/qa/page/project/settings/advanced.rb
index 5ef00504fdf..d7b2b66b587 100644
--- a/qa/qa/page/project/settings/advanced.rb
+++ b/qa/qa/page/project/settings/advanced.rb
@@ -4,9 +4,9 @@ module QA
       module Settings
         class Advanced < Page::Base
           view 'app/views/projects/edit.html.haml' do
-            element :project_path_field, 'f.text_field :path'
-            element :project_name_field, 'f.text_field :name'
-            element :rename_project_button, "f.submit 'Rename project'"
+            element :project_path_field, 'text_field :path'
+            element :project_name_field, 'text_field :name'
+            element :rename_project_button, "submit 'Rename project'"
           end
 
           def rename_to(path)
diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb
index d5da9ea0099..1466bc2e0bf 100644
--- a/qa/qa/page/project/settings/ci_cd.rb
+++ b/qa/qa/page/project/settings/ci_cd.rb
@@ -6,31 +6,33 @@ module QA # rubocop:disable Naming/FileName
           include Common
 
           view 'app/views/projects/settings/ci_cd/show.html.haml' do
-            element :runners_settings, 'Runners'
-            element :secret_variables, 'Variables'
-            element :auto_devops_section, 'Auto DevOps'
+            element :autodevops_settings
+            element :runners_settings
+            element :variables_settings
           end
 
           view 'app/views/projects/settings/ci_cd/_autodevops_form.html.haml' do
-            element :enable_auto_devops_button, 'Enable Auto DevOps'
-            element :domain_input, 'Domain'
+            element :enable_auto_devops_field, 'radio_button :enabled'
+            element :domain_field, 'text_field :domain'
+            element :enable_auto_devops_button, "%strong= s_('CICD|Enable Auto DevOps')"
+            element :domain_input, "%strong= _('Domain')"
             element :save_changes_button, "submit 'Save changes'"
           end
 
           def expand_runners_settings(&block)
-            expand_section('Runners') do
+            expand_section(:runners_settings) do
               Settings::Runners.perform(&block)
             end
           end
 
           def expand_secret_variables(&block)
-            expand_section('Variables') do
+            expand_section(:variables_settings) do
               Settings::SecretVariables.perform(&block)
             end
           end
 
           def enable_auto_devops_with_domain(domain)
-            expand_section('Auto DevOps') do
+            expand_section(:autodevops_settings) do
               choose 'Enable Auto DevOps'
               fill_in 'Domain', with: domain
               click_on 'Save changes'
diff --git a/qa/qa/page/project/settings/main.rb b/qa/qa/page/project/settings/main.rb
index e3faa76b966..d8cf1d49dd2 100644
--- a/qa/qa/page/project/settings/main.rb
+++ b/qa/qa/page/project/settings/main.rb
@@ -6,11 +6,11 @@ module QA
           include Common
 
           view 'app/views/projects/edit.html.haml' do
-            element :advanced_settings_section, 'Advanced'
+            element :advanced_settings
           end
 
           def expand_advanced_settings(&block)
-            expand_section('Advanced settings') do
+            expand_section(:advanced_settings) do
               Advanced.perform(&block)
             end
           end
diff --git a/qa/qa/page/project/settings/merge_request.rb b/qa/qa/page/project/settings/merge_request.rb
index 06d4937a4c8..d044d3715a9 100644
--- a/qa/qa/page/project/settings/merge_request.rb
+++ b/qa/qa/page/project/settings/merge_request.rb
@@ -5,17 +5,17 @@ module QA
         class MergeRequest < QA::Page::Base
           include Common
 
+          view 'app/views/projects/edit.html.haml' do
+            element :merge_request_settings
+            element :save_merge_request_changes
+          end
+
           view 'app/views/projects/_merge_request_merge_method_settings.html.haml' do
             element :radio_button_merge_ff
           end
 
-          view 'app/views/projects/edit.html.haml' do
-            element :merge_request_settings, 'Merge request'
-            element :save_merge_request_changes
-          end
-
           def enable_ff_only
-            expand_section('Merge request') do
+            expand_section(:merge_request_settings) do
               click_element :radio_button_merge_ff
               click_element :save_merge_request_changes
             end
diff --git a/qa/qa/page/project/settings/repository.rb b/qa/qa/page/project/settings/repository.rb
index 30900e74e90..1ed5f455a85 100644
--- a/qa/qa/page/project/settings/repository.rb
+++ b/qa/qa/page/project/settings/repository.rb
@@ -6,17 +6,21 @@ module QA
           include Common
 
           view 'app/views/projects/deploy_keys/_index.html.haml' do
-            element :deploy_keys_section, 'Deploy Keys'
+            element :deploy_keys_settings
+          end
+
+          view 'app/views/projects/protected_branches/shared/_index.html.haml' do
+            element :protected_branches_settings
           end
 
           def expand_deploy_keys(&block)
-            expand_section('Deploy Keys') do
+            expand_section(:deploy_keys_settings) do
               DeployKeys.perform(&block)
             end
           end
 
           def expand_protected_branches(&block)
-            expand_section('Protected Branches') do
+            expand_section(:protected_branches_settings) do
               ProtectedBranches.perform(&block)
             end
           end
diff --git a/qa/qa/page/settings/common.rb b/qa/qa/page/settings/common.rb
index a683a6829d5..f9f71aa4a72 100644
--- a/qa/qa/page/settings/common.rb
+++ b/qa/qa/page/settings/common.rb
@@ -4,19 +4,17 @@ module QA
       module Common
         # Click the Expand button present in the specified section
         #
-        # @param [String] name present in the container in the DOM
-        def expand_section(name)
-          page.within('#content-body') do
-            page.within('section', text: name) do
-              # Because it is possible to click the button before the JS toggle code is bound
-              wait(reload: false) do
-                click_button 'Expand' unless first('button', text: 'Collapse')
+        # @param [Symbol] and `element` name defined in a `view` block
+        def expand_section(element_name)
+          within_element(element_name) do
+            # Because it is possible to click the button before the JS toggle code is bound
+            wait(reload: false) do
+              click_button 'Expand' unless first('button', text: 'Collapse')
 
-                page.has_content?('Collapse')
-              end
-
-              yield if block_given?
+              page.has_content?('Collapse')
             end
+
+            yield if block_given?
           end
         end
       end