diff --git a/app/features/theme/core/ThemePalette.test.ts b/app/features/theme/core/ThemePalette.test.ts
index 7eb218253..ebea1d87e 100644
--- a/app/features/theme/core/ThemePalette.test.ts
+++ b/app/features/theme/core/ThemePalette.test.ts
@@ -74,7 +74,7 @@ describe("ThemePalette.build", () => {
 		}
 
 		expect(failures).toEqual([]);
-	});
+	}, 20_000);
 
 	test("every color is inside the sRGB gamut for any input", () => {
 		const failures: string[] = [];
@@ -101,7 +101,7 @@ describe("ThemePalette.build", () => {
 		}
 
 		expect(failures).toEqual([]);
-	});
+	}, 20_000);
 
 	test("gives a yellow accent a bright light mode fill with dark text on it", () => {
 		const theme = built({ accentHue: 100, accentChroma: 0.3 });
diff --git a/e2e/pages/feed/feed-page.ts b/e2e/pages/feed/feed-page.ts
index 772d05284..5aafdd513 100644
--- a/e2e/pages/feed/feed-page.ts
+++ b/e2e/pages/feed/feed-page.ts
@@ -1,7 +1,11 @@
 import type { Page } from "@playwright/test";
 import { newHomePageSchema } from "~/features/settings/settings-schemas";
 import { SETTINGS_PAGE } from "~/utils/urls";
-import { navigate, waitForPOSTResponse } from "../../helpers/playwright";
+import {
+	expect,
+	navigate,
+	waitForPOSTResponse,
+} from "../../helpers/playwright";
 import { createFormHelpers } from "../../helpers/playwright-form";
 import { FeedPostPage } from "./feed-post-page";
 
@@ -42,7 +46,9 @@ export class FeedPage {
 	async openPost(text: string | RegExp) {
 		await this.post(text).getByRole("link", { name: "Comments" }).click();
 		await this.page.waitForURL(/\/feed\//);
+		const postPage = new FeedPostPage(this.page);
+		await expect(postPage.locators.commentsRegion).toBeVisible();
 
-		return new FeedPostPage(this.page);
+		return postPage;
 	}
 }
diff --git a/e2e/pages/feed/feed-post-page.ts b/e2e/pages/feed/feed-post-page.ts
index fde640d19..d16f5a5ba 100644
--- a/e2e/pages/feed/feed-post-page.ts
+++ b/e2e/pages/feed/feed-post-page.ts
@@ -15,6 +15,7 @@ export class FeedPostPage {
 		const comments = page.getByRole("region", { name: "Comments" });
 		this.locators = {
 			post: page.getByRole("main").getByRole("article"),
+			commentsRegion: comments,
 			comments: comments.getByTestId("chat-message-row"),
 			noCommentsText: page.getByText("No comments yet. Say something nice!"),
 			composer: comments.getByPlaceholder("Press enter to send"),