diff --git a/app/components/UI/AccountOverview/index.js b/app/components/UI/AccountOverview/index.js
index 40f5ce6f5c7..6d122401bde 100644
--- a/app/components/UI/AccountOverview/index.js
+++ b/app/components/UI/AccountOverview/index.js
@@ -47,7 +47,7 @@ import {
   selectSelectedAddress,
 } from '../../../selectors/preferencesController';
 import { createAccountSelectorNavDetails } from '../../Views/AccountSelector';
-import { regex } from '../../../../app/util/regex';
+import { regex } from '../../../util/regex';
 import Text, {
   TextVariant,
 } from '../../../component-library/components/Texts/Text';
@@ -363,7 +363,6 @@ class AccountOverview extends PureComponent {
           keyboardShouldPersistTaps={'never'}
           style={styles.scrollView}
           contentContainerStyle={styles.wrapper}
-          testID={'account-overview'}
         >
           <View style={styles.info} ref={this.mainView}>
             <TouchableOpacity
diff --git a/app/components/UI/AccountRightButton/index.tsx b/app/components/UI/AccountRightButton/index.tsx
index 04c8e5e9ce5..78fbec7ef25 100644
--- a/app/components/UI/AccountRightButton/index.tsx
+++ b/app/components/UI/AccountRightButton/index.tsx
@@ -36,6 +36,7 @@ import { selectProviderConfig } from '../../../selectors/networkController';
 import Routes from '../../../constants/navigation/Routes';
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import Analytics from '../../../core/Analytics/Analytics';
+import { AccountOverviewSelectorsIDs } from '../../../../e2e/selectors/AccountOverview.selectors';
 
 const styles = StyleSheet.create({
   leftButton: {
@@ -161,7 +162,7 @@ const AccountRightButton = ({
     <TouchableOpacity
       style={styles.leftButton}
       onPress={handleButtonPress}
-      testID={'navbar-account-button'}
+      testID={AccountOverviewSelectorsIDs.ACCOUNT_BUTTON}
     >
       <TextInput style={styles.placeholderInput} ref={placeholderInputRef} />
       {selectedAddress ? (
diff --git a/app/components/UI/AddCustomCollectible/index.tsx b/app/components/UI/AddCustomCollectible/index.tsx
index 6ea873e13db..1d0c5646810 100644
--- a/app/components/UI/AddCustomCollectible/index.tsx
+++ b/app/components/UI/AddCustomCollectible/index.tsx
@@ -219,8 +219,6 @@ const AddCustomCollectible = ({
       {...generateTestId(Platform, CUSTOM_TOKEN_CONTAINER_ID)}
     >
       <ActionView
-        cancelTestID={'add-custom-asset-cancel-button'}
-        confirmTestID={'add-custom-asset-confirm-button'}
         cancelText={strings('add_asset.collectibles.cancel_add_collectible')}
         confirmText={strings('add_asset.collectibles.add_collectible')}
         onCancelPress={cancelAddCollectible}
diff --git a/app/components/UI/AddressInputs/index.js b/app/components/UI/AddressInputs/index.js
index 68012b82955..90ebe91cae4 100644
--- a/app/components/UI/AddressInputs/index.js
+++ b/app/components/UI/AddressInputs/index.js
@@ -1,11 +1,5 @@
 import React from 'react';
-import {
-  StyleSheet,
-  View,
-  TextInput,
-  TouchableOpacity,
-  Platform,
-} from 'react-native';
+import { StyleSheet, View, TextInput, TouchableOpacity } from 'react-native';
 import { fontStyles, baseStyles } from '../../../styles/common';
 import AntIcon from 'react-native-vector-icons/AntDesign';
 import FontAwesome from 'react-native-vector-icons/FontAwesome';
@@ -20,8 +14,6 @@ import {
 import { strings } from '../../../../locales/i18n';
 import { hasZeroWidthPoints } from '../../../util/confusables';
 import { useTheme } from '../../../util/theme';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import { SEND_ADDRESS_INPUT_FIELD } from '../../../../wdio/screen-objects/testIDs/Screens/SendScreen.testIds';
 import AddToAddressBookWrapper from '../AddToAddressBookWrapper/AddToAddressBookWrapper';
 import { SendViewSelectorsIDs } from '../../../../e2e/selectors/SendView.selectors';
 import Text, {
@@ -363,7 +355,7 @@ export const AddressTo = (props) => {
               onBlur={onInputBlur}
               onSubmitEditing={onSubmit}
               value={toSelectedAddress}
-              {...generateTestId(Platform, SEND_ADDRESS_INPUT_FIELD)}
+              testID={SendViewSelectorsIDs.ADDRESS_INPUT}
               keyboardAppearance={themeAppearance}
             />
           </View>
@@ -468,7 +460,7 @@ export const AddressTo = (props) => {
                   onBlur={onInputBlur}
                   onSubmitEditing={onSubmit}
                   value={toAddressName}
-                  testID={'txn-to-address-input'}
+                  testID={SendViewSelectorsIDs.ADDRESS_INPUT}
                   keyboardAppearance={themeAppearance}
                 />
               ) : (
diff --git a/app/components/UI/ApproveTransactionReview/index.js b/app/components/UI/ApproveTransactionReview/index.js
index 60556ca0c1e..3b495825aad 100644
--- a/app/components/UI/ApproveTransactionReview/index.js
+++ b/app/components/UI/ApproveTransactionReview/index.js
@@ -9,7 +9,7 @@ import {
 import Eth from 'ethjs-query';
 import ActionView from '../../UI/ActionView';
 import PropTypes from 'prop-types';
-import { getApproveNavbar } from '../../UI/Navbar';
+import { getApproveNavbar } from '../Navbar';
 import { connect } from 'react-redux';
 import { getHost } from '../../../util/browser';
 import {
@@ -98,7 +98,7 @@ import { getRampNetworks } from '../../../reducers/fiatOrders';
 import SkeletonText from '../Ramp/common/components/SkeletonText';
 import InfoModal from '../../../components/UI/Swaps/components/InfoModal';
 import TransactionBlockaidBanner from '../TransactionBlockaidBanner/TransactionBlockaidBanner';
-import { regex } from '../../../../app/util/regex';
+import { regex } from '../../../util/regex';
 
 const { ORIGIN_DEEPLINK, ORIGIN_QR_CODE } = AppConstants.DEEPLINKS;
 const POLLING_INTERVAL_ESTIMATED_L1_FEE = 30000;
@@ -784,7 +784,7 @@ class ApproveTransactionReview extends PureComponent {
 
     return (
       <>
-        <View style={styles.section} testID={'approve-modal-test-id'}>
+        <View style={styles.section}>
           {from && (
             <ApproveTransactionHeader
               dontWatchAsset
@@ -821,11 +821,7 @@ class ApproveTransactionReview extends PureComponent {
                         onContactUsClicked={this.onContactUsClicked}
                       />
                     )}
-                    <Text
-                      variant={TextVariant.HeadingMD}
-                      style={styles.title}
-                      testID={'allow-access'}
-                    >
+                    <Text variant={TextVariant.HeadingMD} style={styles.title}>
                       {strings(
                         `spend_limit_edition.${
                           originIsDeeplink
@@ -1185,7 +1181,7 @@ class ApproveTransactionReview extends PureComponent {
     } = this.props;
     const styles = this.getStyles();
     return (
-      <View style={styles.actionViewQRObject} testID={'qr-details'}>
+      <View style={styles.actionViewQRObject}>
         <TransactionHeader
           currentPageInformation={{
             origin,
diff --git a/app/components/UI/AssetList/index.js b/app/components/UI/AssetList/index.js
index a7bc85e9516..c5c89f3709d 100644
--- a/app/components/UI/AssetList/index.js
+++ b/app/components/UI/AssetList/index.js
@@ -1,13 +1,12 @@
 import React, { PureComponent } from 'react';
-import { View, StyleSheet, Platform } from 'react-native';
+import { View, StyleSheet } from 'react-native';
 import PropTypes from 'prop-types';
 import { strings } from '../../../../locales/i18n';
 import StyledButton from '../StyledButton'; // eslint-disable-line  import/no-unresolved
 import AssetIcon from '../AssetIcon';
 import { fontStyles } from '../../../styles/common';
 import Text from '../../Base/Text';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import { TOKEN_RESULTS_LIST_ID } from '../../../../wdio/screen-objects/testIDs/Screens/AssetSearch.testIds';
+import { ImportTokenViewSelectorsIDs } from '../../../../e2e/selectors/ImportTokenView.selectors';
 
 const styles = StyleSheet.create({
   rowWrapper: {
@@ -81,7 +80,7 @@ export default class AssetList extends PureComponent {
               containerStyle={styles.item}
               onPress={() => handleSelectAsset(searchResults[i])} // eslint-disable-line
               key={i}
-              {...generateTestId(Platform, TOKEN_RESULTS_LIST_ID)}
+              testID={ImportTokenViewSelectorsIDs.CONTAINER}
             >
               <View style={styles.assetListElement}>
                 <AssetIcon address={address} logo={iconUrl} />
diff --git a/app/components/Views/AddAsset/__snapshots__/AddAsset.test.tsx.snap b/app/components/Views/AddAsset/__snapshots__/AddAsset.test.tsx.snap
index bb5c05f9e32..09e0f6e7c5c 100644
--- a/app/components/Views/AddAsset/__snapshots__/AddAsset.test.tsx.snap
+++ b/app/components/Views/AddAsset/__snapshots__/AddAsset.test.tsx.snap
@@ -315,7 +315,7 @@ exports[`AddAsset component renders correctly 1`] = `
                   null,
                 ]
               }
-              testID="add-custom-asset-cancel-button"
+              testID=""
             >
               <Text
                 style={
@@ -378,7 +378,7 @@ exports[`AddAsset component renders correctly 1`] = `
                   },
                 ]
               }
-              testID="add-custom-asset-confirm-button"
+              testID=""
             >
               <Text
                 style={
diff --git a/e2e/pages/Drawer/Browser.js b/e2e/pages/Drawer/Browser.js
index d29c91738fd..2ae23f77f34 100644
--- a/e2e/pages/Drawer/Browser.js
+++ b/e2e/pages/Drawer/Browser.js
@@ -8,7 +8,6 @@ import {
   SEARCH_BUTTON,
   NAVBAR_TITLE_NETWORK,
   ANDROID_BROWSER_WEBVIEW_ID,
-  ACCOUNT_BUTTON,
 } from '../../../wdio/screen-objects/testIDs/BrowserScreen/BrowserScreen.testIds';
 import { URL_INPUT_BOX_ID } from '../../../wdio/screen-objects/testIDs/BrowserScreen/AddressBar.testIds';
 import {
@@ -26,6 +25,7 @@ import {
   BrowserViewSelectorsText,
 } from '../../selectors/BrowserView.selectors';
 import { CommonSelectorsText } from '../../selectors/Common.selectors';
+import { AccountOverviewSelectorsIDs } from '../../selectors/AccountOverview.selectors';
 
 const TEST_DAPP = 'https://metamask.github.io/test-dapp/';
 
@@ -60,7 +60,7 @@ export default class Browser {
     if (device.getPlatform() === 'android') {
       await TestHelpers.delay(3000); // to wait until toast notifcation disappears
       await TestHelpers.tapByDescendentTestID(
-        ACCOUNT_BUTTON,
+        AccountOverviewSelectorsIDs.ACCOUNT_BUTTON,
         BrowserViewSelectorsIDs.AVATAR_IMAGE,
       );
     } else {
diff --git a/e2e/pages/ImportTokensView.js b/e2e/pages/ImportTokensView.js
index 6c8e30e7e16..003ef92d41b 100644
--- a/e2e/pages/ImportTokensView.js
+++ b/e2e/pages/ImportTokensView.js
@@ -2,10 +2,12 @@ import TestHelpers from '../helpers';
 import { CUSTOM_TOKEN_CONTAINER_ID } from '../../wdio/screen-objects/testIDs/Screens/AddCustomToken.testIds';
 import {
   ASSET_BACK_BUTTON,
-  TOKEN_RESULTS_LIST_ID,
   TOKEN_INPUT_BOX_ID,
 } from '../../wdio/screen-objects/testIDs/Screens/AssetSearch.testIds';
-import { ImportTokenViewSelectorsText } from '../selectors/ImportTokenView.selectors';
+import {
+  ImportTokenViewSelectorsIDs,
+  ImportTokenViewSelectorsText,
+} from '../selectors/ImportTokenView.selectors';
 
 export default class ImportTokensView {
   static async tapImportButton() {
@@ -24,9 +26,11 @@ export default class ImportTokensView {
   }
   static async tapOnToken() {
     if (device.getPlatform() === 'android') {
-      await TestHelpers.tapItemAtIndexByLabel(TOKEN_RESULTS_LIST_ID);
+      await TestHelpers.tapItemAtIndexByLabel(
+        ImportTokenViewSelectorsIDs.CONTAINER,
+      );
     } else {
-      await TestHelpers.tapItemAtIndex(TOKEN_RESULTS_LIST_ID);
+      await TestHelpers.tapItemAtIndex(ImportTokenViewSelectorsIDs.CONTAINER);
     }
   }
 
diff --git a/e2e/selectors/AccountOverview.selectors.js b/e2e/selectors/AccountOverview.selectors.js
new file mode 100644
index 00000000000..99f45f2525e
--- /dev/null
+++ b/e2e/selectors/AccountOverview.selectors.js
@@ -0,0 +1,4 @@
+// eslint-disable-next-line import/prefer-default-export
+export const AccountOverviewSelectorsIDs = {
+  ACCOUNT_BUTTON: 'navbar-account-button',
+};
diff --git a/e2e/selectors/ImportTokenView.selectors.js b/e2e/selectors/ImportTokenView.selectors.js
index 4a7b23e09dd..b61084cca16 100644
--- a/e2e/selectors/ImportTokenView.selectors.js
+++ b/e2e/selectors/ImportTokenView.selectors.js
@@ -1,6 +1,9 @@
 import messages from '../../locales/languages/en.json';
 
-// eslint-disable-next-line import/prefer-default-export
+export const ImportTokenViewSelectorsIDs = {
+  CONTAINER: 'searched-token-result',
+};
+
 export const ImportTokenViewSelectorsText = {
   IMPORT_BUTTON: messages.add_asset.tokens.add_token,
   CANCEL_BUTTON: messages.add_asset.tokens.cancel_add_token,
diff --git a/e2e/selectors/SendView.selectors.js b/e2e/selectors/SendView.selectors.js
index e3000ab867b..28f2c7611f9 100644
--- a/e2e/selectors/SendView.selectors.js
+++ b/e2e/selectors/SendView.selectors.js
@@ -6,4 +6,5 @@ export const SendViewSelectorsIDs = {
   ADDRESS_REMOVE_BUTTON: 'clear-address-button',
   ADDRESS_BOOK_ACCOUNT: 'address-book-account',
   ADDRESS_BOOK_NEXT_BUTTON: 'address-book-next-button',
+  ADDRESS_INPUT: 'txn-to-address-input',
 };
diff --git a/wdio/screen-objects/testIDs/Screens/AssetSearch.testIds.js b/wdio/screen-objects/testIDs/Screens/AssetSearch.testIds.js
index 5e6f4d77bb3..ffd252ac2c4 100644
--- a/wdio/screen-objects/testIDs/Screens/AssetSearch.testIds.js
+++ b/wdio/screen-objects/testIDs/Screens/AssetSearch.testIds.js
@@ -1,5 +1,2 @@
 export const TOKEN_INPUT_BOX_ID = 'input-search-asset';
 export const ASSET_BACK_BUTTON = 'asset-back-button';
-export const TOKEN_RESULTS_LIST_ID = 'searched-token-result';
-export const ADD_SEARCHED_TOKEN = 'add-searched-token-screen';
-