3 files changed, 7 insertions, 5 deletions
diff --git a/spec/features/groups/settings/ci_cd_spec.rb b/spec/features/groups/settings/ci_cd_spec.rb
index a1acb73178b..bf056f535f2 100644
--- a/spec/features/groups/settings/ci_cd_spec.rb
+++ b/spec/features/groups/settings/ci_cd_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe 'Group CI/CD settings', feature_category: :continuous_integration
   end
 
   describe 'Runners section' do
-    let(:shared_runners_toggle) { page.find('[data-testid="shared-runners-toggle"]') }
+    let(:shared_runners_toggle) { find_by_testid('shared-runners-toggle') }
 
     before do
       visit group_settings_ci_cd_path(group)
diff --git a/spec/features/groups/settings/group_badges_spec.rb b/spec/features/groups/settings/group_badges_spec.rb
index 1f16a288882..1ae61853748 100644
--- a/spec/features/groups/settings/group_badges_spec.rb
+++ b/spec/features/groups/settings/group_badges_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Group Badges', feature_category: :groups_and_projects do
+RSpec.describe 'Group Badges', feature_category: :groups_and_projects, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/430713' do
   include WaitForRequests
 
   let(:user) { create(:user) }
diff --git a/spec/features/groups/settings/packages_and_registries_spec.rb b/spec/features/groups/settings/packages_and_registries_spec.rb
index cbd26441e2b..934234aa171 100644
--- a/spec/features/groups/settings/packages_and_registries_spec.rb
+++ b/spec/features/groups/settings/packages_and_registries_spec.rb
@@ -65,8 +65,10 @@ RSpec.describe 'Group Package and registry settings', feature_category: :package
 
       wait_for_requests
 
+      # rubocop:disable Capybara/TestidFinders -- Helper within_testid doesn't cover use case
       expect(page).to be_axe_clean.within('[data-testid="packages-and-registries-group-settings"]')
                                   .skipping :'link-in-text-block', :'heading-order'
+      # rubocop:enable Capybara/TestidFinders
     end
 
     it 'has a Duplicate packages section', :js do
@@ -81,7 +83,7 @@ RSpec.describe 'Group Package and registry settings', feature_category: :package
       visit_settings_page
       wait_for_requests
 
-      within '[data-testid="maven-settings"]' do
+      within_testid 'maven-settings' do
         expect(page).to have_field _('Exceptions'), disabled: true
 
         click_button class: 'gl-toggle'
@@ -98,7 +100,7 @@ RSpec.describe 'Group Package and registry settings', feature_category: :package
       visit_settings_page
       wait_for_requests
 
-      within '[data-testid="maven-settings"]' do
+      within_testid 'maven-settings' do
         click_button class: 'gl-toggle'
 
         fill_in _('Exceptions'), with: ')'
@@ -115,7 +117,7 @@ RSpec.describe 'Group Package and registry settings', feature_category: :package
         visit_sub_group_settings_page
         wait_for_requests
 
-        within '[data-testid="maven-settings"]' do
+        within_testid 'maven-settings' do
           expect(page).to have_content('Allow duplicates')
 
           expect(page).to have_field _('Exceptions'), disabled: true