diff --git a/tests/mock/localStorage.ts b/tests/mock/localStorage.ts
index ebe779d0..0f46647b 100644
--- a/tests/mock/localStorage.ts
+++ b/tests/mock/localStorage.ts
@@ -3,9 +3,9 @@ export const SAVED_ACCOUNT_1 =
 export const SAVED_ACCOUNT_1_SECRET =
   "SADVGAH3VA3NGZ5VLX2ZICV7JQAINB2ZJZYOPMBXUNI3YRLGWLOA2OFY";
 export const SAVED_ACCOUNT_2 =
-  "GD4F2N2OM2IM4MI6F6J5GVENQLNRVCYEE6XFN36MJOU5MOVFUYYSPBYG";
+  "GC5TQ7TXKHGE5JQMZPYV5KBSQ67X6PYQVU5QN7JRGWCHRA227UFPZ6LD";
 export const SAVED_ACCOUNT_2_SECRET =
-  "SDVMTXXSUJG6GKFCETCKFV6FCGE7C5FYKBCV4AMD4N3SRYCDSA53KEG4";
+  "SCPPMMBZBQGTGQKIPGFJDOHOPGK7SXZJGMYF76PFHF2PBLY2RWGZNSVV";
 
 const SAVED_ACCOUNTS = [
   {
diff --git a/tests/savedKeypairs.test.ts b/tests/savedKeypairs.test.ts
index ebda9904..90b47426 100644
--- a/tests/savedKeypairs.test.ts
+++ b/tests/savedKeypairs.test.ts
@@ -57,6 +57,17 @@ test.describe("Saved Keypairs Page", () => {
           });
         },
       );
+
+      // Account 2 Friendbot response
+      await pageContext.route(
+        `https://friendbot.stellar.org/?addr=${SAVED_ACCOUNT_2}`,
+        async (route) => {
+          await route.fulfill({
+            status: 200,
+            contentType: "application/hal+json; charset=utf-8",
+          });
+        },
+      );
     });
 
     test("Loads", async () => {
@@ -106,16 +117,6 @@ test.describe("Saved Keypairs Page", () => {
 
       await expect(fundButton).toBeVisible();
 
-      const friendbotUrl = `https://friendbot.stellar.org/?addr=${SAVED_ACCOUNT_2}`;
-
-      // Mock fund account
-      await pageContext.route(friendbotUrl, async (route) => {
-        await route.fulfill({
-          status: 200,
-          contentType: "application/hal+json; charset=utf-8",
-        });
-      });
-
       // Wait for the Friendbot response
       const friendbotResponse = pageContext.waitForResponse(
         (response) =>
@@ -125,7 +126,6 @@ test.describe("Saved Keypairs Page", () => {
 
       await fundButton.click();
       await friendbotResponse;
-      await pageContext.unroute(friendbotUrl);
 
       // Mock Account 2 response
       await pageContext.route(