diff --git a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
index 662451c5eb43b538b5fc6b543342f42f31404ae2..62924dcd0a822d4613d78934b701a50807fc4b64 100644
--- a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
+++ b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
@@ -281,7 +281,7 @@ export default {
           :shape="$options.AVATAR_SHAPE_OPTION_RECT"
         />
         <div>
-          <div data-testid="project-name" data-qa-selector="project_name">{{ item.name }}</div>
+          <div data-testid="project-name">{{ item.name }}</div>
           <div class="gl-text-gray-500" data-testid="project-full-path">
             {{ item.fullPath }}
           </div>
diff --git a/app/assets/javascripts/authentication/password/components/password_input.vue b/app/assets/javascripts/authentication/password/components/password_input.vue
index 6e3af96cf33839e53b72316140338a17d6407660..7f2a2beaa47939a7a2e58c4ff1510853a2da854d 100644
--- a/app/assets/javascripts/authentication/password/components/password_input.vue
+++ b/app/assets/javascripts/authentication/password/components/password_input.vue
@@ -27,11 +27,6 @@ export default {
       required: false,
       default: null,
     },
-    qaSelector: {
-      type: String,
-      required: false,
-      default: null,
-    },
     testid: {
       type: String,
       required: false,
@@ -80,7 +75,6 @@ export default {
       :autocomplete="autocomplete"
       :name="name"
       :minlength="minimumPasswordLength"
-      :data-qa-selector="qaSelector"
       :data-testid="testid"
       :title="title"
       :type="type"
diff --git a/app/assets/javascripts/authentication/password/index.js b/app/assets/javascripts/authentication/password/index.js
index a4f2d038cf74abb10c90959b0a743d0600454ff9..903512a7b533cbcd1417993fa00bd276e651e1a7 100644
--- a/app/assets/javascripts/authentication/password/index.js
+++ b/app/assets/javascripts/authentication/password/index.js
@@ -9,7 +9,7 @@ export const initPasswordInput = () => {
     }
 
     const { form } = el;
-    const { title, id, minimumPasswordLength, qaSelector, testid, autocomplete, name } = el.dataset;
+    const { title, id, minimumPasswordLength, testid, autocomplete, name } = el.dataset;
 
     // eslint-disable-next-line no-new
     new Vue({
@@ -21,7 +21,6 @@ export const initPasswordInput = () => {
             title,
             id,
             minimumPasswordLength,
-            qaSelector,
             testid,
             autocomplete,
             name,
diff --git a/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue b/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue
index 907b68e6ffc242aa8f023e29d59ef6b1beda771b..e97846bae2906201f90fa18fbf8f823e7c656ab0 100644
--- a/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue
+++ b/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue
@@ -119,7 +119,6 @@ export default {
         type="password"
         name="current_password"
         :state="currentPasswordState"
-        data-qa-selector="current_password_field"
       />
     </gl-form-group>
 
diff --git a/app/assets/javascripts/blob/filepath_form/components/template_selector.vue b/app/assets/javascripts/blob/filepath_form/components/template_selector.vue
index 379d5e3819734f0a7fa385e48c8bf2f7c5ab9a1f..e9f54639fdd459a8f64429ec2f665d11b39b75af 100644
--- a/app/assets/javascripts/blob/filepath_form/components/template_selector.vue
+++ b/app/assets/javascripts/blob/filepath_form/components/template_selector.vue
@@ -149,7 +149,6 @@ export default {
       block
       class="gl-font-regular"
       data-testid="template-selector"
-      data-qa-selector="template_selector"
       :toggle-text="dropdownToggleText"
       :search-placeholder="$options.i18n.searchPlaceholder"
       :items="dropdownItems"
diff --git a/qa/qa/page/file/form.rb b/qa/qa/page/file/form.rb
index 30cd4f11bb4249b135d8fc1e47c497c52f09163b..61216f7b28dd9fc9b91fb2ab59d98db1fe34f65c 100644
--- a/qa/qa/page/file/form.rb
+++ b/qa/qa/page/file/form.rb
@@ -15,7 +15,7 @@ class Form < Page::Base
         end
 
         view 'app/assets/javascripts/blob/filepath_form/components/template_selector.vue' do
-          element :template_selector
+          element 'template-selector'
         end
 
         def add_name(name)
@@ -35,7 +35,7 @@ def add_custom_name(template_name)
         def select_template(template_type, template)
           case template_type
           when '.gitignore', '.gitlab-ci.yml', 'Dockerfile', 'LICENSE'
-            click_element :template_selector
+            click_element 'template-selector'
           else
             raise %(Unsupported template_type "#{template_type}". Please confirm that it is a valid option.)
           end
diff --git a/spec/frontend/authentication/password/components/password_input_spec.js b/spec/frontend/authentication/password/components/password_input_spec.js
index 5b2a9da993b96fc7374c1181475bb5d3d066b0e6..62438e824cf3ceeba31971e50642508e1e0b1af2 100644
--- a/spec/frontend/authentication/password/components/password_input_spec.js
+++ b/spec/frontend/authentication/password/components/password_input_spec.js
@@ -9,7 +9,6 @@ describe('PasswordInput', () => {
     title: 'This field is required',
     id: 'new_user_password',
     minimumPasswordLength: '8',
-    qaSelector: 'new_user_password_field',
     testid: 'new_user_password',
     autocomplete: 'new-password',
     name: 'new_user',