4 files changed, 5 insertions, 5 deletions
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
index b708564e23a..2da28910af3 100644
--- a/app/views/admin/groups/_form.html.haml
+++ b/app/views/admin/groups/_form.html.haml
@@ -41,6 +41,6 @@
 
   - else
     .gl-mt-5
-      = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+      = f.submit _('Save changes'), data: { testid: 'save-changes-button' }, pajamas_button: true
       = render Pajamas::ButtonComponent.new(href: admin_group_path(@group)) do
         = _('Cancel')
diff --git a/app/views/admin/groups/_group.html.haml b/app/views/admin/groups/_group.html.haml
index 20d24161c57..0c4bf91f545 100644
--- a/app/views/admin/groups/_group.html.haml
+++ b/app/views/admin/groups/_group.html.haml
@@ -1,11 +1,11 @@
 - group = local_assigns.fetch(:group)
 
-%li.group-row.gl-py-3.gl-align-items-center{ class: 'gl-display-flex!', data: { qa_selector: 'group_row_content' } }
+%li.group-row.gl-py-3.gl-align-items-center{ class: 'gl-display-flex!', data: { testid: 'group-row-content' } }
   = render Pajamas::AvatarComponent.new(group, size: 32, alt: '')
 
   .gl-min-w-0.gl-flex-grow-1.gl-ml-3
     .title
-      = link_to [:admin, group], class: 'group-name', data: { qa_selector: 'group_name_link' } do
+      = link_to [:admin, group], class: 'group-name', data: { testid: 'group-name-link' } do
         = group.full_name
 
     - if group.description.present?
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index 2a49b9c5ad8..9f42897d1da 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -7,7 +7,7 @@
       = hidden_field_tag :sort, @sort
       .search-holder
         .search-field-holder
-          = search_field_tag :name, params[:name].presence, class: "form-control search-text-input js-search-input", autofocus: true, spellcheck: false, placeholder: 'Search by name', data: { qa_selector: 'group_search_field' }
+          = search_field_tag :name, params[:name].presence, class: "form-control search-text-input js-search-input", autofocus: true, spellcheck: false, placeholder: 'Search by name', data: { testid: 'group-search-field' }
           = sprite_icon('search', css_class: 'search-icon')
         = render "shared/groups/dropdown", options_hash: admin_groups_sort_options_hash
         = render Pajamas::ButtonComponent.new(variant: :confirm, href: new_admin_group_path) do
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 5f5f6c98663..f7a49c88d78 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -8,7 +8,7 @@
   = _('Group: %{group_name}') % { group_name: @group.full_name }
 
   = render Pajamas::ButtonComponent.new(href: admin_group_edit_path(@group),
-    button_options: { class: 'gl-float-right', data: { qa_selector: 'edit_group_link' }},
+    button_options: { class: 'gl-float-right', data: { testid: 'edit-group-link' }},
     icon: 'pencil') do
     = _('Edit')
 %hr