diff --git a/tests/e2e/fixtures/auth.ts b/tests/e2e/fixtures/auth.ts
index 4d4d13f20..a5c2942c8 100644
--- a/tests/e2e/fixtures/auth.ts
+++ b/tests/e2e/fixtures/auth.ts
@@ -29,7 +29,7 @@ export async function loginViaUi(page: Page, account: E2EAccount) {
 export async function logoutViaUi(page: Page, account: E2EAccount) {
 	await page.getByText(account.email).click();
 	await page.getByRole("menuitem", { name: "Logout" }).click();
-	await page.goto("/auth/login");
+	await page.waitForURL(/\/auth\/login/);
 }
 
 async function registerViaApi(request: APIRequestContext, account: E2EAccount, baseURL: string) {
diff --git a/tests/e2e/fixtures/db.ts b/tests/e2e/fixtures/db.ts
index d221be760..c79f80ca4 100644
--- a/tests/e2e/fixtures/db.ts
+++ b/tests/e2e/fixtures/db.ts
@@ -1,15 +1,11 @@
 import type { E2EAccount } from "./data";
 import { Pool } from "pg";
 
-function getDatabaseUrl() {
+export async function deleteE2EUser(account: E2EAccount) {
 	const databaseUrl = process.env.DATABASE_URL;
 	if (!databaseUrl) throw new Error("DATABASE_URL is required for E2E cleanup.");
 
-	return databaseUrl;
-}
-
-export async function deleteE2EUser(account: E2EAccount) {
-	const pool = new Pool({ connectionString: getDatabaseUrl() });
+	const pool = new Pool({ connectionString: databaseUrl });
 
 	try {
 		await pool.query('delete from "user" where email = $1 or username = $2', [account.email, account.username]);
diff --git a/tests/e2e/fixtures/resume.ts b/tests/e2e/fixtures/resume.ts
index 1645fc814..4e7750a9f 100644
--- a/tests/e2e/fixtures/resume.ts
+++ b/tests/e2e/fixtures/resume.ts
@@ -15,7 +15,7 @@ export async function createSampleResumeFromDashboard(page: Page, testInfo: Test
 	await createGroup.getByRole("button").nth(1).click();
 	await page.getByRole("menuitem", { name: "Create a Sample Resume" }).click();
 
-	const resumeLink = page.getByRole("link", { name: new RegExp(resumeName) });
+	const resumeLink = page.getByRole("link", { name: resumeName, exact: true });
 	await expect(resumeLink).toBeVisible();
 	await resumeLink.click();
 	await page.waitForURL(/\/builder\/.+/);
diff --git a/tests/e2e/fixtures/test.ts b/tests/e2e/fixtures/test.ts
index 85891132e..b3638bfb5 100644
--- a/tests/e2e/fixtures/test.ts
+++ b/tests/e2e/fixtures/test.ts
@@ -12,8 +12,7 @@ type Fixtures = {
 };
 
 export const test = base.extend<Fixtures>({
-	account: async ({ baseURL }, use, testInfo) => {
-		void baseURL;
+	account: async ({}, use, testInfo) => {
 		const account = createAccount(testInfo);
 
 		try {
@@ -22,13 +21,12 @@ export const test = base.extend<Fixtures>({
 			await deleteE2EUser(account);
 		}
 	},
-	authContext: async ({ browser, request, account }, use, testInfo) => {
-		const baseURL = String(testInfo.project.use.baseURL ?? "http://localhost:3000");
-		const context = await createAuthenticatedContext(browser, request, account, baseURL);
+	authContext: async ({ browser, request, account, baseURL }, use) => {
+		const context = await createAuthenticatedContext(browser, request, account, baseURL ?? "http://localhost:3000");
 
 		try {
 			await use(context);
-		} finally {
+
 			await context.close();
 		}
 	},