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/wallet.spec.ts b/apps/laboratory/tests/wallet.spec.ts
index e3d25dc8d4..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,11 +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()