diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 46fd9fc4109f..b30fa8d93c0b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,7 +8,7 @@ Please make sure to read CONTRIBUTING.md if you have not already. Pull Requests
 <!-- Pull Requests must pass the CI and be code reviewed. Set as Draft if the PR is not ready. -->
 
 - [ ] `npx changeset` was attached.
-- [ ] **Covered by automatic tests.** <!-- if not, please explain. (Feature must be tested / Bugfix must bring non-regression) -->
+- [ ] **Covered by automatic tests.** <!-- if not, please explain. (Feature must be tested / Bug fix must bring non-regression) -->
 - [ ] **Impact of the changes:** <!-- Please take some time to list the impact & what specific areas Quality Assurance (QA) should focus on -->
   - ...
 
@@ -16,7 +16,7 @@ Please make sure to read CONTRIBUTING.md if you have not already. Pull Requests
 
 _Replace this text by a clear and concise description of what this pull request is about and why it is needed. Be sure to explain the problem you're addressing and the solution you're proposing._
 _For libraries, you can add a code sample of how to use it._
-_For bugfixes, you can explain the previous behavior and how it was fixed._
+_For bug fixes, you can explain the previous behaviour and how it was fixed._
 _In case of visual features, please attach screenshots or video recordings to demonstrate the changes._
 
 <!--
diff --git a/apps/ledger-live-desktop/tests/enum/Account.ts b/apps/ledger-live-desktop/tests/enum/Account.ts
index 2408d0a396e5..28523d0cd0d9 100644
--- a/apps/ledger-live-desktop/tests/enum/Account.ts
+++ b/apps/ledger-live-desktop/tests/enum/Account.ts
@@ -1,10 +1,12 @@
 import { Currency } from "./Currency";
+import { AccountType } from "tests/enum/AccountType";
 
 export class Account {
   constructor(
     public readonly currency: Currency,
     public readonly accountName: string,
     public readonly address: string,
+    public readonly accountType?: AccountType,
   ) {}
 
   static readonly BTC_NATIVE_SEGWIT_1 = new Account(
@@ -257,12 +259,14 @@ export class Account {
     Currency.ETH_USDT,
     "Ethereum 1",
     "0xB9051f83AC6e147924377BBEebd1Aa7aB43a67F6",
+    AccountType.ERC20,
   );
 
   static readonly ETH_USDT_2 = new Account(
     Currency.ETH_USDT,
     "Ethereum 2",
     "0x43047a5023D55a8658Fcb1c1Cea468311AdAA3Ad",
+    AccountType.ERC20,
   );
 
   static readonly ETH_LIDO = new Account(
@@ -299,6 +303,7 @@ export class Account {
     Currency.TRX_USDT,
     "Tron 1",
     "TDUKFB9wj3P5f2iNvkRuaDDeWVkTdUVhs1",
+    AccountType.TRC20,
   );
 
   static readonly TRX_BTT = new Account(
diff --git a/apps/ledger-live-desktop/tests/enum/AccountType.ts b/apps/ledger-live-desktop/tests/enum/AccountType.ts
new file mode 100644
index 000000000000..14945edf2b00
--- /dev/null
+++ b/apps/ledger-live-desktop/tests/enum/AccountType.ts
@@ -0,0 +1,4 @@
+export enum AccountType {
+  ERC20 = "erc20",
+  TRC20 = "trc20",
+}
diff --git a/apps/ledger-live-desktop/tests/enum/Swap.ts b/apps/ledger-live-desktop/tests/enum/Swap.ts
index fbe0cc2a28c4..0e1f0dc278a1 100644
--- a/apps/ledger-live-desktop/tests/enum/Swap.ts
+++ b/apps/ledger-live-desktop/tests/enum/Swap.ts
@@ -1,5 +1,10 @@
-export enum Providers {
-  CHANGELLY = "changelly",
+export class Provider {
+  constructor(
+    public readonly name: string,
+    public readonly uiName: string,
+  ) {}
+  static readonly CHANGELLY = new Provider("changelly", "Changelly");
+  static readonly ONEINCH = new Provider("oneinch", "1inch");
 }
 
 export enum Rates {
diff --git a/apps/ledger-live-desktop/tests/models/Swap.ts b/apps/ledger-live-desktop/tests/models/Swap.ts
index d1a36721f28f..e0702c1eed5d 100644
--- a/apps/ledger-live-desktop/tests/models/Swap.ts
+++ b/apps/ledger-live-desktop/tests/models/Swap.ts
@@ -1,17 +1,22 @@
 import { Transaction } from "tests/models/Transaction";
 import { Fee } from "tests/enum/Fee";
 import { Account } from "../enum/Account";
+import { Provider } from "../enum/Swap";
 
 export class Swap extends Transaction {
+  provider: Provider;
+
   constructor(
     accountToDebit: Account,
     accountToCredit: Account,
     amount: string,
     speed: Fee,
+    provider: Provider,
     public amountToReceive?: string,
     public feesAmount?: string,
   ) {
     super(accountToDebit, accountToCredit, amount, speed);
+    this.provider = provider;
   }
 
   public setAmountToReceive(value: string) {
diff --git a/apps/ledger-live-desktop/tests/page/abstractClasses.ts b/apps/ledger-live-desktop/tests/page/abstractClasses.ts
index 0d2041efedc9..dcce168461e1 100644
--- a/apps/ledger-live-desktop/tests/page/abstractClasses.ts
+++ b/apps/ledger-live-desktop/tests/page/abstractClasses.ts
@@ -25,6 +25,10 @@ export abstract class Component extends PageHolder {
   async waitForPageLoadState() {
     return await this.page.waitForLoadState("load");
   }
+
+  async waitForPageNetworkidleState() {
+    return await this.page.waitForLoadState("networkidle");
+  }
 }
 
 export abstract class AppPage extends Component {}
diff --git a/apps/ledger-live-desktop/tests/page/speculos.page.ts b/apps/ledger-live-desktop/tests/page/speculos.page.ts
index d982e9795325..86659a7627d5 100644
--- a/apps/ledger-live-desktop/tests/page/speculos.page.ts
+++ b/apps/ledger-live-desktop/tests/page/speculos.page.ts
@@ -74,16 +74,8 @@ export class SpeculosPage extends AppPage {
       verifyAmount(`${swap.accountToDebit.currency.ticker} ${swap.amount}`, sendAmountScreen),
     ).toBeTruthy();
     const getAmountScreen = await pressRightUntil(sendPattern[1]);
-    expect(
-      verifyAmount(
-        `${swap.accountToCredit.currency.ticker} ${extractNumberFromString(swap.amountToReceive)}`,
-        getAmountScreen,
-      ),
-    ).toBeTruthy();
-    const feesAmountScreen = await pressRightUntil(sendPattern[2]);
-    expect(
-      verifySwapFeesAmount(extractNumberFromString(swap.feesAmount), feesAmountScreen),
-    ).toBeTruthy();
+    this.verifySwapGetAmountScreen(swap, getAmountScreen);
+    this.verifySwapFeesAmountScreen(swap, await pressRightUntil(sendPattern[2]));
     await pressRightUntil(DeviceLabels.REJECT);
     await pressBoth();
   }
@@ -145,4 +137,36 @@ export class SpeculosPage extends AppPage {
         throw new Error(`Unsupported currency: ${currencyName}`);
     }
   }
+
+  verifySwapGetAmountScreen(swap: Swap, getAmountScreen: string[]) {
+    if (swap.accountToCredit.currency.name === "Solana") {
+      expect(
+        verifyAmount(
+          `${extractNumberFromString(swap.amountToReceive)} ${swap.accountToCredit.currency.ticker}`,
+          getAmountScreen,
+        ),
+      ).toBeTruthy();
+    } else {
+      expect(
+        verifyAmount(
+          `${swap.accountToCredit.currency.ticker} ${extractNumberFromString(swap.amountToReceive)}`,
+          getAmountScreen,
+        ),
+      ).toBeTruthy();
+    }
+  }
+
+  verifySwapFeesAmountScreen(swap: Swap, feesAmountScreen: string[]) {
+    let speculosFeesAmount = "";
+    if (swap.feesAmount) {
+      //max number of chars on the screen
+      speculosFeesAmount =
+        extractNumberFromString(swap.feesAmount).length < 18
+          ? extractNumberFromString(swap.feesAmount)
+          : extractNumberFromString(swap.feesAmount).substring(0, 17);
+    }
+    expect(
+      verifySwapFeesAmount(swap.accountToDebit.currency.name, speculosFeesAmount, feesAmountScreen),
+    ).toBeTruthy();
+  }
 }
diff --git a/apps/ledger-live-desktop/tests/page/swap.page.ts b/apps/ledger-live-desktop/tests/page/swap.page.ts
index c4f483d878b7..011cda21fb48 100644
--- a/apps/ledger-live-desktop/tests/page/swap.page.ts
+++ b/apps/ledger-live-desktop/tests/page/swap.page.ts
@@ -3,6 +3,7 @@ import { waitFor } from "../utils/waitFor";
 import { step } from "tests/misc/reporters/step";
 import { ElectronApplication, expect } from "@playwright/test";
 import { capitalizeFirstLetter } from "tests/utils/textParserUtils";
+import { Account } from "tests/enum/Account";
 
 export class SwapPage extends AppPage {
   private currencyByName = (accountName: string) => this.page.getByText(accountName); // TODO: this is rubbish. Changed this
@@ -115,10 +116,7 @@ export class SwapPage extends AppPage {
   }
 
   @step("Select exchange quote $0 with rate $1")
-  async selectExchangeQuote(
-    providerName: "changelly" | "cic" | "oneinch" | "paraswap",
-    exchangeType: "fixed" | "float",
-  ) {
+  async selectExchangeQuote(providerName: string, exchangeType: "fixed" | "float") {
     await this.quoteContainer(providerName, exchangeType).click();
   }
 
@@ -150,13 +148,25 @@ export class SwapPage extends AppPage {
     return this.detailsSwapId.innerText();
   }
 
-  @step("Select account to swap from: $0")
-  async selectAccountToSwapFrom(accountToSwapFrom: string) {
+  getAccountName(account: Account) {
+    //erc20 accounts names are stored in account currency property
+    return account.accountType ? account.currency.name : account.accountName;
+  }
+
+  @step("Select account to swap from")
+  async selectAccountToSwapFrom(accountToSwapFrom: Account) {
     await this.originCurrencyDropdown.click();
-    await this.dropdownOptions.locator(this.optionWithText(accountToSwapFrom)).click();
+    const accName = this.getAccountName(accountToSwapFrom);
+    if (accountToSwapFrom.accountType) {
+      await this.dropdownOptions
+        .locator(this.optionWithTextAndFollowingText(accountToSwapFrom.accountName, accName))
+        .first()
+        .click();
+    } else {
+      await this.dropdownOptions.locator(this.optionWithText(accName)).first().click();
+    }
     const selectedAccountFrom = this.originCurrencyDropdown.locator(this.dropdownSelectedValue);
-    await expect(selectedAccountFrom).toHaveText(accountToSwapFrom);
-    await this.waitForPageLoadState();
+    await expect(selectedAccountFrom).toHaveText(accName);
   }
 
   @step("Fill in amount: $0")
diff --git a/apps/ledger-live-desktop/tests/playwright.config.ts b/apps/ledger-live-desktop/tests/playwright.config.ts
index 028af3024939..f8afb6ef1be8 100644
--- a/apps/ledger-live-desktop/tests/playwright.config.ts
+++ b/apps/ledger-live-desktop/tests/playwright.config.ts
@@ -6,17 +6,18 @@ const config: PlaywrightTestConfig = {
       name: "speculos_tests",
       testDir: "specs/speculos/",
       retries: process.env.CI ? 2 : 0,
+      timeout: process.env.CI ? 400000 : 1200000,
     },
     {
       name: "mocked_tests",
       testDir: "specs/",
       testIgnore: ["**/speculos/**", "specs/recorder.spec.ts"],
+      timeout: process.env.CI ? 190000 : 600000,
     },
   ],
   outputDir: "./artifacts/test-results",
   snapshotPathTemplate:
     "{snapshotDir}/{testFileDir}/{testFileName}-snapshots/{arg}{-platform}{ext}",
-  timeout: process.env.CI ? 190000 : 600000,
   expect: {
     timeout: 41000,
     toHaveScreenshot: {
diff --git a/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts b/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts
index 6841f9d20102..af5da1f402fd 100644
--- a/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts
+++ b/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts
@@ -4,65 +4,140 @@ import { AppInfos } from "tests/enum/AppInfos";
 import { setExchangeDependencies } from "@ledgerhq/live-common/e2e/speculos";
 import { Fee } from "tests/enum/Fee";
 import { Swap } from "tests/models/Swap";
-import { Providers, Rates } from "tests/enum/Swap";
+import { Provider, Rates } from "tests/enum/Swap";
+import { addTmsLink } from "tests/utils/allureUtils";
+import { getDescription } from "tests/utils/customJsonReporter";
 
 const swaps = [
   {
-    swap: new Swap(Account.ETH_1, Account.BTC_NATIVE_SEGWIT_1, "0.015", Fee.MEDIUM),
+    swap: new Swap(
+      Account.ETH_1,
+      Account.BTC_NATIVE_SEGWIT_1,
+      "0.02",
+      Fee.MEDIUM,
+      Provider.CHANGELLY,
+    ),
+    xrayTicket: "B2CQA-2750",
+  },
+  {
+    swap: new Swap(
+      Account.BTC_NATIVE_SEGWIT_1,
+      Account.ETH_1,
+      "0.00067",
+      Fee.MEDIUM,
+      Provider.CHANGELLY,
+    ),
+    xrayTicket: "B2CQA-2744",
+  },
+  {
+    swap: new Swap(Account.ETH_USDT_1, Account.ETH_1, "40", Fee.MEDIUM, Provider.CHANGELLY),
+    xrayTicket: "B2CQA-2752",
+  },
+  {
+    swap: new Swap(Account.ETH_1, Account.SOL_1, "0.018", Fee.MEDIUM, Provider.CHANGELLY),
+    xrayTicket: "B2CQA-2748",
+  },
+  {
+    swap: new Swap(Account.ETH_1, Account.ETH_USDT_1, "0.02", Fee.MEDIUM, Provider.CHANGELLY),
+    xrayTicket: "B2CQA-2749",
+  },
+  {
+    swap: new Swap(
+      Account.BTC_NATIVE_SEGWIT_1,
+      Account.SOL_1,
+      "0.0006",
+      Fee.MEDIUM,
+      Provider.CHANGELLY,
+    ),
+    xrayTicket: "B2CQA-2747",
+  },
+  {
+    swap: new Swap(
+      Account.BTC_NATIVE_SEGWIT_1,
+      Account.ETH_USDT_1,
+      "0.0006",
+      Fee.MEDIUM,
+      Provider.CHANGELLY,
+    ),
+    xrayTicket: "B2CQA-2746",
+  },
+  {
+    swap: new Swap(
+      Account.ETH_USDT_1,
+      Account.BTC_NATIVE_SEGWIT_1,
+      "40",
+      Fee.MEDIUM,
+      Provider.CHANGELLY,
+    ),
+    xrayTicket: "B2CQA-2753",
+  },
+  {
+    swap: new Swap(Account.ETH_USDT_1, Account.SOL_1, "40", Fee.MEDIUM, Provider.CHANGELLY),
+    xrayTicket: "B2CQA-2751",
   },
 ];
 
 const app: AppInfos = AppInfos.EXCHANGE;
 
-for (const { swap } of swaps) {
-  test.beforeAll(async () => {
-    process.env.SWAP_DISABLE_APPS_INSTALL = "true";
-    process.env.SWAP_API_BASE = "https://swap-stg.ledger.com/v5";
-  });
+for (const { swap, xrayTicket } of swaps) {
+  test.describe("Swap", () => {
+    test.beforeAll(async () => {
+      process.env.SWAP_DISABLE_APPS_INSTALL = "true";
+      process.env.SWAP_API_BASE = "https://swap-stg.ledger.com/v5";
+    });
 
-  test.afterAll(async () => {
-    delete process.env.SWAP_DISABLE_APPS_INSTALL;
-    delete process.env.SWAP_API_BASE;
-  });
+    test.beforeEach(async () => {
+      setExchangeDependencies(
+        accPair.map(appName => ({
+          name: appName,
+        })),
+      );
+    });
+
+    test.afterAll(async () => {
+      delete process.env.SWAP_DISABLE_APPS_INSTALL;
+      delete process.env.SWAP_API_BASE;
+    });
 
-  test.describe.serial("Swap", () => {
     const accPair: string[] = [swap.accountToDebit, swap.accountToCredit].map(acc =>
-      acc.currency.name.replace(/ /g, "_"),
-    );
-    setExchangeDependencies(
-      accPair.map(appName => ({
-        name: appName,
-      })),
+      acc.currency.speculosApp.name.replace(/ /g, "_"),
     );
+
     test.use({
       userdata: "speculos-tests-app",
       speculosApp: app,
     });
 
-    test(`Swap ${swap.accountToDebit.currency.name} to ${swap.accountToCredit.currency.name}`, async ({
-      app,
-      electronApp,
-    }) => {
-      const provider = Providers.CHANGELLY;
-      const rate = Rates.FLOAT;
-      await app.layout.goToSwap();
-      await app.swap.selectAccountToSwapFrom(swap.accountToDebit.accountName);
-      await app.swap.selectCurrencyToSwapTo(swap.accountToCredit.currency.name);
-
-      await app.swap.fillInOriginAmount(swap.amount);
-      await app.swap.selectExchangeQuote(provider, rate);
-      await app.swap.clickExchangeButton(electronApp, provider);
-      const amountTo = await app.swapDrawer.getAmountToReceive();
-      const fees = await app.swapDrawer.getFees();
-      swap.setAmountToReceive(amountTo);
-      swap.setFeesAmount(fees);
-      await app.swapDrawer.verifyAmountToReceive(amountTo);
-      await app.swapDrawer.verifyAmountSent(swap.amount, swap.accountToDebit.currency.ticker);
-      await app.swapDrawer.verifySourceAccount(swap.accountToDebit.currency.name);
-      await app.swapDrawer.verifyTargetCurrency(swap.accountToCredit.currency.name);
-      await app.swapDrawer.verifyProvider(provider);
-      await app.speculos.verifyAmountsAndRejectSwap(swap);
-      await app.swapDrawer.verifyExchangeErrorTextContent("Operation denied on device");
-    });
+    test(
+      `Swap ${swap.accountToDebit.currency.name} to ${swap.accountToCredit.currency.name}`,
+      {
+        annotation: {
+          type: "TMS",
+          description: xrayTicket,
+        },
+      },
+      async ({ app, electronApp }) => {
+        await addTmsLink(getDescription(test.info().annotations).split(", "));
+        const rate = Rates.FLOAT;
+        await app.layout.goToSwap();
+        await app.swap.waitForPageNetworkidleState();
+        await app.swap.selectAccountToSwapFrom(swap.accountToDebit);
+        await app.swap.selectCurrencyToSwapTo(swap.accountToCredit.currency.name);
+        await app.swap.fillInOriginAmount(swap.amount);
+        await app.swap.selectExchangeQuote(swap.provider.name, rate);
+        await app.swap.clickExchangeButton(electronApp, swap.provider.uiName);
+        const amountTo = await app.swapDrawer.getAmountToReceive();
+        const fees = await app.swapDrawer.getFees();
+        swap.setAmountToReceive(amountTo);
+        swap.setFeesAmount(fees);
+        await app.swapDrawer.verifyAmountToReceive(amountTo);
+        await app.swapDrawer.verifyAmountSent(swap.amount, swap.accountToDebit.currency.ticker);
+        await app.swapDrawer.verifySourceAccount(swap.accountToDebit.currency.name);
+        await app.swapDrawer.verifyTargetCurrency(swap.accountToCredit.currency.name);
+        await app.swapDrawer.verifyProvider(swap.provider.name);
+        await app.speculos.verifyAmountsAndRejectSwap(swap);
+        await app.swapDrawer.verifyExchangeErrorTextContent("Operation denied on device");
+      },
+    );
   });
 }
diff --git a/libs/ledger-live-common/src/e2e/speculos.ts b/libs/ledger-live-common/src/e2e/speculos.ts
index a688762d58f5..977f1370e6ac 100644
--- a/libs/ledger-live-common/src/e2e/speculos.ts
+++ b/libs/ledger-live-common/src/e2e/speculos.ts
@@ -30,7 +30,13 @@ export type Spec = {
 export type Dependency = { name: string; appVersion?: string };
 
 export function setExchangeDependencies(dependencies: Dependency[]) {
-  specs["Exchange"].dependencies = dependencies;
+  const map = new Map<string, Dependency>();
+  for (const dep of dependencies) {
+    if (!map.has(dep.name)) {
+      map.set(dep.name, dep);
+    }
+  }
+  specs["Exchange"].dependencies = Array.from(map.values());
 }
 
 type Specs = {
@@ -380,8 +386,16 @@ export function verifyProvider(provider: string, text: string[]): boolean {
   return providerDevice.includes(provider);
 }
 
-export function verifySwapFeesAmount(amount: string, text: string[]): boolean {
-  const amountDevice = text[3];
+export function verifySwapFeesAmount(currency: string, amount: string, text: string[]): boolean {
+  let amountDevice = text[1];
+  switch (currency) {
+    case "Ethereum":
+      amountDevice = text[3];
+      break;
+    case "Tether USD":
+      amountDevice = text[3];
+      break;
+  }
   return amountDevice.includes(amount);
 }