diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9387e1bd2aa..3ee5aa7beeb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - changed: Use the UI4 warning card for the Reveal Raw Keys and Reveal Master Private Key password confirmation warnings.
 - changed: Tron resource staking now describes its claim action as reclaiming your own TRX, instead of claiming a reward.
 - changed: Deep links now wait only for the account state they actually use, so a link that just opens a scene, such as the buy/sell entry, follows immediately after login instead of waiting for every wallet to finish loading.
+- changed: Add maestro test selectors (testIDs) to the swap scene's from and to wallet pills.
 - fixed: The buy/sell amount field no longer reads "Amount undefined" while the app is still working out which wallet to use.
 - fixed: Show the Monero Transaction Key of a send whose key never reached the transaction's saved metadata, by falling back to the key the wallet engine mirrors into `otherParams`. Covers sends made on 4.49.0 and later while the send path reported no key, on devices that still hold the original wallet cache.
 - fixed: Force `NODE_ENV=test` in the Jest script so UI tests keep working when npm is invoked via Socket (Socket otherwise sets `NODE_ENV=development`, which makes react-native-gesture-handler treat Jest as a non-test env).
diff --git a/src/components/scenes/SwapCreateScene.tsx b/src/components/scenes/SwapCreateScene.tsx
index f42ec8d90b1..3b461aa2afc 100644
--- a/src/components/scenes/SwapCreateScene.tsx
+++ b/src/components/scenes/SwapCreateScene.tsx
@@ -560,6 +560,7 @@ export const SwapCreateScene: React.FC<Props> = props => {
                 ]}
                 tokenId={fromTokenId}
                 wallet={fromWallet}
+                walletPillTestID="swapFromWalletPill"
               />
             )}
           </EdgeAnim>
@@ -603,6 +604,7 @@ export const SwapCreateScene: React.FC<Props> = props => {
                 ]}
                 tokenId={toTokenId}
                 wallet={toWallet}
+                walletPillTestID="swapToWalletPill"
                 heading={lstrings.exchange_title_receiving}
               />
             )}
diff --git a/src/components/themed/SwapInput.tsx b/src/components/themed/SwapInput.tsx
index 73e8de1ff0f..012546faa43 100644
--- a/src/components/themed/SwapInput.tsx
+++ b/src/components/themed/SwapInput.tsx
@@ -61,6 +61,7 @@ export interface Props {
   onFocus?: () => void
   onNext?: () => void
   onSelectWallet: () => Promise<void>
+  walletPillTestID?: string
 }
 
 const forceFieldMap: { crypto: FieldNum; fiat: FieldNum } = {
@@ -80,6 +81,7 @@ const SwapInputComponent = React.forwardRef<SwapInputCardInputRef, Props>(
       tokenId,
       wallet,
       walletPlaceholderText,
+      walletPillTestID,
       // Events:
       onAmountChanged,
       onSelectWallet,
@@ -320,6 +322,7 @@ const SwapInputComponent = React.forwardRef<SwapInputCardInputRef, Props>(
           <PillButton
             label={walletPlaceholderText}
             onPress={onSelectWallet}
+            testID={walletPillTestID}
             icon={() => (
               <CryptoIcon
                 pluginId={wallet.currencyInfo.pluginId}