diff --git a/apps/laboratory/src/components/Solana/SolanaWriteContractTest.tsx b/apps/laboratory/src/components/Solana/SolanaWriteContractTest.tsx
index 4454a76edf..d7ce96901c 100644
--- a/apps/laboratory/src/components/Solana/SolanaWriteContractTest.tsx
+++ b/apps/laboratory/src/components/Solana/SolanaWriteContractTest.tsx
@@ -101,7 +101,11 @@ export function SolanaWriteContractTest() {
   }
 
   return (
-    <Button isDisabled={loading} data-testid="sign-message-button" onClick={onIncrementCounter}>
+    <Button
+      isDisabled={loading}
+      data-testid="increment-counter-with-sign-button"
+      onClick={onIncrementCounter}
+    >
       Increment Counter With Sign
     </Button>
   )
diff --git a/apps/laboratory/tests/email.spec.ts b/apps/laboratory/tests/email.spec.ts
index f9d057d4c0..a990fc7a1c 100644
--- a/apps/laboratory/tests/email.spec.ts
+++ b/apps/laboratory/tests/email.spec.ts
@@ -28,7 +28,8 @@ testMEmail('it should switch network and sign', async ({ modalPage, modalValidat
   let targetChain = 'Polygon'
   await modalPage.switchNetwork(targetChain)
   await modalValidator.expectNetwork(targetChain)
-  await modalPage.page.waitForTimeout(3500)
+  await modalPage.closeModal()
+  await modalPage.page.waitForTimeout(1500)
   await modalPage.sign()
   await modalPage.approveSign()
   await modalValidator.expectAcceptedSign()
@@ -38,7 +39,8 @@ testMEmail('it should switch network and sign', async ({ modalPage, modalValidat
   targetChain = 'Ethereum'
   await modalPage.switchNetwork(targetChain)
   await modalValidator.expectNetwork(targetChain)
-  await modalPage.page.waitForTimeout(3500)
+  await modalPage.closeModal()
+  await modalPage.page.waitForTimeout(1500)
   await modalPage.sign()
   await modalPage.approveSign()
   await modalValidator.expectAcceptedSign()
diff --git a/apps/laboratory/tests/shared/pages/ModalPage.ts b/apps/laboratory/tests/shared/pages/ModalPage.ts
index 3fae7819b4..67e1ee3788 100644
--- a/apps/laboratory/tests/shared/pages/ModalPage.ts
+++ b/apps/laboratory/tests/shared/pages/ModalPage.ts
@@ -210,7 +210,8 @@ export class ModalPage {
     await this.page.getByTestId('account-button').click()
     await this.page.getByTestId('w3m-account-select-network').click()
     await this.page.getByTestId(`w3m-network-switch-${network}`).click()
-    await this.page.getByTestId('w3m-header-close').click()
+    // Network switch might take a second or two
+    await this.page.waitForTimeout(2000)
   }
 
   async clickWalletDeeplink() {
diff --git a/apps/laboratory/tests/shared/validators/ModalValidator.ts b/apps/laboratory/tests/shared/validators/ModalValidator.ts
index 27c7d64064..ccbf6820b7 100644
--- a/apps/laboratory/tests/shared/validators/ModalValidator.ts
+++ b/apps/laboratory/tests/shared/validators/ModalValidator.ts
@@ -53,7 +53,7 @@ export class ModalValidator {
   }
 
   async expectNetwork(network: string) {
-    const networkButton = this.page.locator('wui-network-button')
+    const networkButton = this.page.getByTestId('w3m-account-select-network')
     await expect(networkButton, `Network button should contain text ${network}`).toHaveText(
       network,
       {
diff --git a/apps/laboratory/tests/wallet.spec.ts b/apps/laboratory/tests/wallet.spec.ts
index 001a7d3978..26ba70761b 100644
--- a/apps/laboratory/tests/wallet.spec.ts
+++ b/apps/laboratory/tests/wallet.spec.ts
@@ -41,7 +41,7 @@ testConnectedMW(
 testConnectedMW(
   'it should switch networks and sign',
   async ({ modalPage, walletPage, modalValidator, walletValidator }) => {
-    const chains = modalPage.library === 'solana' ? ['Solana'] : ['Polygon', 'Ethereum']
+    const chains = modalPage.library === 'solana' ? ['Solana Devnet'] : ['Polygon', 'Ethereum']
 
     // Run them one after another
     async function processChain(index: number) {
@@ -50,9 +50,13 @@ testConnectedMW(
       }
 
       const chainName = chains[index] ?? DEFAULT_CHAIN_NAME
+      // For Solana, even though we switch to Solana Devnet, the chain name on the wallet page is still Solana
+      const chainNameOnWalletPage = modalPage.library === 'solana' ? 'Solana' : chainName
       await modalPage.switchNetwork(chainName)
+      await modalValidator.expectNetwork(chainName)
+      await modalPage.closeModal()
       await modalPage.sign()
-      await walletValidator.expectReceivedSign({ chainName })
+      await walletValidator.expectReceivedSign({ chainName: chainNameOnWalletPage })
       await walletPage.handleRequest({ accept: true })
       await modalValidator.expectAcceptedSign()