diff --git a/ee/spec/frontend/members/components/table/members_table_spec.js b/ee/spec/frontend/members/components/table/members_table_spec.js
index 9bac8df5e319550166e56110e1237d8f60c2bfa9..32a06fbac4d09e281a3e5c6faa47ff7d191cd45f 100644
--- a/ee/spec/frontend/members/components/table/members_table_spec.js
+++ b/ee/spec/frontend/members/components/table/members_table_spec.js
@@ -26,8 +26,7 @@ describe('MemberList', () => {
             members: [],
             tableFields: [],
             tableAttrs: {
-              table: { 'data-qa-selector': 'members_list' },
-              tr: { 'data-qa-selector': 'member_row' },
+              tr: { 'data-testid': 'member-row' },
             },
             pagination: {},
             ...state,
diff --git a/spec/frontend/authentication/password/components/password_input_spec.js b/spec/frontend/authentication/password/components/password_input_spec.js
index 62438e824cf3ceeba31971e50642508e1e0b1af2..d31bfea224aa111a25bc99c9bdaffe6853dda8bb 100644
--- a/spec/frontend/authentication/password/components/password_input_spec.js
+++ b/spec/frontend/authentication/password/components/password_input_spec.js
@@ -32,7 +32,6 @@ describe('PasswordInput', () => {
     expect(findPasswordInput().attributes('autocomplete')).toBe(propsData.autocomplete);
     expect(findPasswordInput().attributes('name')).toBe(propsData.name);
     expect(findPasswordInput().attributes('minlength')).toBe(propsData.minimumPasswordLength);
-    expect(findPasswordInput().attributes('data-qa-selector')).toBe(propsData.qaSelector);
     expect(findPasswordInput().attributes('data-testid')).toBe(propsData.testid);
     expect(findPasswordInput().attributes('title')).toBe(propsData.title);
   });
diff --git a/spec/frontend/members/components/table/members_table_spec.js b/spec/frontend/members/components/table/members_table_spec.js
index c2400fbc1428feab0932bfaec92ce931fb664b60..9fcf1853ef5db378b4154ca71391f6ab6c0570ef 100644
--- a/spec/frontend/members/components/table/members_table_spec.js
+++ b/spec/frontend/members/components/table/members_table_spec.js
@@ -45,8 +45,7 @@ describe('MembersTable', () => {
             members: [],
             tableFields: [],
             tableAttrs: {
-              table: { 'data-qa-selector': 'members_list' },
-              tr: { 'data-qa-selector': 'member_row' },
+              tr: { 'data-testid': 'member-row' },
             },
             pagination,
             ...state,
@@ -274,16 +273,10 @@ describe('MembersTable', () => {
     });
   });
 
-  it('adds QA selector to table', () => {
+  it('adds QA testid to table row', () => {
     createComponent();
 
-    expect(findTable().attributes('data-qa-selector')).toBe('members_list');
-  });
-
-  it('adds QA selector to table row', () => {
-    createComponent();
-
-    expect(findTable().find('tbody tr').attributes('data-qa-selector')).toBe('member_row');
+    expect(findTable().find('tbody tr').attributes('data-testid')).toBe('member-row');
   });
 
   describe('when required pagination data is provided', () => {
diff --git a/spec/frontend/members/index_spec.js b/spec/frontend/members/index_spec.js
index b1730cf3746998e1de7fec8ad1689a761ce60dc0..a48ed9442927a072120f7afd453d23ead6a282ec 100644
--- a/spec/frontend/members/index_spec.js
+++ b/spec/frontend/members/index_spec.js
@@ -13,7 +13,7 @@ describe('initMembersApp', () => {
     vm = initMembersApp(el, {
       [MEMBER_TYPES.user]: {
         tableFields: ['account'],
-        tableAttrs: { table: { 'data-qa-selector': 'members_list' } },
+        tableAttrs: { table: { 'data-testid': 'members-list' } },
         tableSortableFields: ['account'],
         requestFormatter: () => ({}),
         filteredSearchBar: { show: false },
@@ -61,7 +61,7 @@ describe('initMembersApp', () => {
     setup();
 
     expect(vm.$store.state[MEMBER_TYPES.user].tableAttrs).toEqual({
-      table: { 'data-qa-selector': 'members_list' },
+      table: { 'data-testid': 'members-list' },
     });
   });