diff --git a/packages/core-mobile/app/screens/portfolio/account/AccountItem.tsx b/packages/core-mobile/app/screens/portfolio/account/AccountItem.tsx
index cd2b9fa81e..c065cbe905 100644
--- a/packages/core-mobile/app/screens/portfolio/account/AccountItem.tsx
+++ b/packages/core-mobile/app/screens/portfolio/account/AccountItem.tsx
@@ -29,6 +29,7 @@ type Props = {
   editable?: boolean
   selected?: boolean
   blurred?: boolean
+  testID?: string
 }
 
 function AccountItem({
@@ -36,7 +37,8 @@ function AccountItem({
   onSelectAccount,
   editable,
   selected,
-  blurred
+  blurred,
+  testID
 }: Props): JSX.Element {
   const { activeNetwork } = useNetworks()
   const walletType = useSelector(selectWalletType)
@@ -99,6 +101,7 @@ function AccountItem({
   return (
     <>
       <AvaButton.Base
+        testID={testID}
         onPress={() => onSelectAccount?.(account.index)}
         style={[
           {
diff --git a/packages/core-mobile/app/screens/portfolio/account/AccountView.tsx b/packages/core-mobile/app/screens/portfolio/account/AccountView.tsx
index 8238f3fc39..90c7b67e7a 100644
--- a/packages/core-mobile/app/screens/portfolio/account/AccountView.tsx
+++ b/packages/core-mobile/app/screens/portfolio/account/AccountView.tsx
@@ -101,6 +101,7 @@ function AccountItemRenderer({
   const activeAccount = useSelector(selectActiveAccount)
   return (
     <AccountItem
+      testID={`account__${account.name}`}
       key={account.name}
       account={account}
       editable
diff --git a/packages/core-mobile/e2e/pages/accountManage.page.ts b/packages/core-mobile/e2e/pages/accountManage.page.ts
index de1531b5af..754203fec3 100644
--- a/packages/core-mobile/e2e/pages/accountManage.page.ts
+++ b/packages/core-mobile/e2e/pages/accountManage.page.ts
@@ -121,7 +121,6 @@ class AccountManagePage {
     await delay(1000)
     for (let i = 1; i < account; i++) {
       await this.tapAddAccountButton()
-      await delay(1000)
     }
     await this.tapNthAccount(account)
     await this.tapDoneButton()
@@ -131,7 +130,7 @@ class AccountManagePage {
   async tapNthAccount(account: number) {
     try {
       await Action.waitForElementNoSync(by.text(`Account ${account}`))
-      await Action.tap(by.text(`Account ${account}`))
+      await Action.tap(by.id(`account__Account ${account}`))
     } catch (e) {
       console.log('Unable to tap Nth account')
     }
@@ -191,8 +190,9 @@ class AccountManagePage {
   }
 
   async tapAddAccountButton() {
-    await Action.waitForElementNoSync(this.addAccountButton)
+    await Action.waitForElementNoSync(this.addAccountButton, 5000)
     await Action.tapElementAtIndex(this.addAccountButton, 0)
+    await delay(1000)
   }
 
   async tapAddEditAccounts() {
diff --git a/packages/core-mobile/e2e/tests/portfolioTab/tokens/addCustomToken.e2e.smoke.ts b/packages/core-mobile/e2e/tests/portfolioTab/tokens/addCustomToken.e2e.smoke.ts
index 31ce8b5451..e5b8bfa41e 100644
--- a/packages/core-mobile/e2e/tests/portfolioTab/tokens/addCustomToken.e2e.smoke.ts
+++ b/packages/core-mobile/e2e/tests/portfolioTab/tokens/addCustomToken.e2e.smoke.ts
@@ -29,6 +29,7 @@ describe('Add custom token', () => {
     await Actions.waitForElementNotVisible(
       ManageTokensPage.inputContractAddress
     )
-    await Actions.waitForElement(ManageTokensPage.manageTokenList)
+    await Actions.waitForElement(ManageTokensPage.added)
+    await Actions.waitForElement(ManageTokensPage.addcustomToken)
   })
 })