diff --git a/test/e2e/playwright/models/elements/login.ts b/test/e2e/playwright/models/elements/login.ts
index baae9b11834a..a6ea12629db5 100644
--- a/test/e2e/playwright/models/elements/login.ts
+++ b/test/e2e/playwright/models/elements/login.ts
@@ -143,16 +143,19 @@ export class LoginPage {
   }
 
   async submit(method: string, opts?: SubmitOptions) {
-    const nav = opts?.waitForURL
-      ? this.page.waitForURL(opts.waitForURL)
-      : Promise.resolve()
+    const waitFor = [
+      opts?.waitForURL
+        ? this.page.waitForURL(opts.waitForURL)
+        : Promise.resolve(),
+    ]
+
     if (opts?.submitWithKeyboard) {
-      await this.page.keyboard.press("Enter")
+      waitFor.push(this.page.keyboard.press("Enter"))
     } else {
-      await this.submitMethod(method).click()
+      waitFor.push(this.submitMethod(method).click())
     }
 
-    await nav
+    await Promise.all(waitFor)
   }
 
   //
diff --git a/test/e2e/playwright/tests/desktop/identifier_first/code.login.spec.ts b/test/e2e/playwright/tests/desktop/identifier_first/code.login.spec.ts
index b94dbf29669c..aed035d4c2ae 100644
--- a/test/e2e/playwright/tests/desktop/identifier_first/code.login.spec.ts
+++ b/test/e2e/playwright/tests/desktop/identifier_first/code.login.spec.ts
@@ -8,7 +8,7 @@ import { test } from "../../../fixtures"
 import { extractCode, toConfig } from "../../../lib/helper"
 import { LoginPage } from "../../../models/elements/login"
 
-test.describe.parallel("account enumeration protection off", () => {
+test.describe("account enumeration protection off", () => {
   test.use({
     configOverride: toConfig({
       style: "identifier_first",
diff --git a/test/e2e/playwright/tests/desktop/identifier_first/password.login.spec.ts b/test/e2e/playwright/tests/desktop/identifier_first/password.login.spec.ts
index 982c2ead22d6..fd6026cb39fb 100644
--- a/test/e2e/playwright/tests/desktop/identifier_first/password.login.spec.ts
+++ b/test/e2e/playwright/tests/desktop/identifier_first/password.login.spec.ts
@@ -14,11 +14,19 @@ test.describe("account enumeration protection off", () => {
     configOverride: toConfig({
       style: "identifier_first",
       mitigateEnumeration: false,
+      selfservice: {
+        methods: {
+          password: {
+            enabled: true,
+          },
+          code: {
+            passwordless_enabled: false,
+          },
+        },
+      },
     }),
   })
 
-  test.describe.configure({ mode: "parallel" })
-
   test("login fails because user does not exist", async ({ page, config }) => {
     const login = new LoginPage(page, config)
     await login.open()
@@ -118,10 +126,19 @@ test.describe("account enumeration protection on", () => {
     configOverride: toConfig({
       style: "identifier_first",
       mitigateEnumeration: true,
+      selfservice: {
+        methods: {
+          password: {
+            enabled: true,
+          },
+          code: {
+            passwordless_enabled: false,
+          },
+        },
+      },
     }),
   })
 
-  test.describe.configure({ mode: "parallel" })
   test("login fails because user does not exist", async ({ page, config }) => {
     const login = new LoginPage(page, config)
     await login.open()
diff --git a/test/e2e/playwright/tests/mobile/app_login.spec.ts b/test/e2e/playwright/tests/mobile/app_login.spec.ts
index 327fbbf3e54a..6dd6a93ba551 100644
--- a/test/e2e/playwright/tests/mobile/app_login.spec.ts
+++ b/test/e2e/playwright/tests/mobile/app_login.spec.ts
@@ -4,8 +4,6 @@
 import { expect, Page } from "@playwright/test"
 import { test } from "../../fixtures"
 
-test.describe.configure({ mode: "parallel" })
-
 async function performOidcLogin(popup: Page, username: string) {
   await popup.waitForLoadState()