diff --git a/config/test.json b/config/test.json
index d8439a6e7..5aaa9ca8b 100644
--- a/config/test.json
+++ b/config/test.json
@@ -5,7 +5,7 @@
   },
   "preferredSeeds": [
     {
-      "hostname": "127.0.0.1",
+      "hostname": "localhost",
       "port": 8081,
       "scheme": "http"
     }
diff --git a/src/App.svelte b/src/App.svelte
index ecb8e579d..939cdc7e4 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -66,7 +66,7 @@
 <Hotkeys />
 
 {#if $activeRouteStore.resource === "booting"}
-  <div class="loading">
+  <div class="loading" role="progressbar" aria-label="App loading">
     <Loading />
   </div>
 {:else if $activeRouteStore.resource === "nodes"}
diff --git a/tests/e2e/node.spec.ts b/tests/e2e/node.spec.ts
index daf5fd5a3..7eed36791 100644
--- a/tests/e2e/node.spec.ts
+++ b/tests/e2e/node.spec.ts
@@ -62,7 +62,7 @@ test("edit seed bookmarks", async ({ page }) => {
           Location: route
             .request()
             .url()
-            .replace("seed.example.tld", "127.0.0.1"),
+            .replace("seed.example.tld", "localhost"),
         },
       }),
   );
@@ -73,7 +73,7 @@ test("edit seed bookmarks", async ({ page }) => {
     .getByRole("button", { name: "Toggle seed selector dropdown" })
     .click();
   await expect(page.getByPlaceholder("seed.radicle.example")).toHaveValue(
-    "127.0.0.1",
+    "localhost",
   );
   await expect(
     page.getByRole("button", { name: "Default seeds can't be removed" }),
diff --git a/tests/e2e/repo.ts b/tests/e2e/repo.spec.ts
similarity index 99%
rename from tests/e2e/repo.ts
rename to tests/e2e/repo.spec.ts
index c8bd0f1ef..cd852cc02 100644
--- a/tests/e2e/repo.ts
+++ b/tests/e2e/repo.spec.ts
@@ -287,7 +287,7 @@ test("clone modal", async ({ page }) => {
   await page.getByRole("button", { name: "Git" }).click();
   await expect(
     page.getByText(
-      `http://127.0.0.1/${sourceBrowsingRid.replace("rad:", "")}.git`,
+      `http://localhost/${sourceBrowsingRid.replace("rad:", "")}.git`,
     ),
   ).toBeVisible();
 });
diff --git a/tests/e2e/router.ts b/tests/e2e/router.spec.ts
similarity index 95%
rename from tests/e2e/router.ts
rename to tests/e2e/router.spec.ts
index 472dc5cb1..70a735aeb 100644
--- a/tests/e2e/router.ts
+++ b/tests/e2e/router.spec.ts
@@ -35,8 +35,8 @@ test("navigation between node and repo pages", async ({ page }) => {
   await expectBackAndForwardNavigationWorks("/nodes/localhost", page);
   await expectUrlPersistsReload(page);
 
-  await page.getByRole("link", { name: "Local Node" }).click();
-  await expect(page).toHaveURL("/nodes/127.0.0.1");
+  await page.getByRole("link", { name: "Radicle logo localhost" }).click();
+  await expect(page).toHaveURL("/nodes/localhost");
 });
 
 test.describe("repo page navigation", () => {
@@ -46,7 +46,12 @@ test.describe("repo page navigation", () => {
     const repoHistoryURL = `${sourceBrowsingUrl}/history/${aliceMainHead}`;
     await page.goto(repoHistoryURL);
 
-    await page.getByText("Add README.md").click();
+    await page
+      .getByRole("link", {
+        name: "Verify that crate::DoubleColon::should_work()",
+        exact: true,
+      })
+      .click();
     await expect(page).toHaveURL(
       `${sourceBrowsingUrl}/commits/${aliceMainHead}`,
     );
diff --git a/tests/support/router.ts b/tests/support/router.ts
index 3d54c784c..de2999c3c 100644
--- a/tests/support/router.ts
+++ b/tests/support/router.ts
@@ -5,6 +5,9 @@ import { expect } from "@tests/support/fixtures.js";
 export const expectUrlPersistsReload = async (page: Page) => {
   const url = page.url();
   await page.reload();
+  await page
+    .getByRole("progressbar", { name: "App loading" })
+    .waitFor({ state: "hidden" });
   await expect(page).toHaveURL(url);
 };