diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
index f39a89e8c6..73ec0c782d 100644
--- a/.github/workflows/e2e-win.yml
+++ b/.github/workflows/e2e-win.yml
@@ -7,7 +7,7 @@ on:
     paths:
       - '.github/workflows/e2e-win.yml'
       - 'packages/cli/**'
-      - 'packages/e2e/**'
+      - 'packages/e2e-test/**'
       - 'packages/create-app/**'
 
 jobs:
@@ -48,3 +48,5 @@ jobs:
         run: yarn build --ignore example-app --ignore example-backend --ignore @techdocs/cli
       - name: run E2E test
         run: yarn e2e-test run
+        env:
+          DEBUG: zombie
diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts
index 89a46704c2..b0db715f25 100644
--- a/packages/e2e-test/src/commands/run.ts
+++ b/packages/e2e-test/src/commands/run.ts
@@ -369,7 +369,7 @@ async function testAppServe(pluginName: string, appDir: string) {
         successful = true;
         break;
       } catch (error) {
-        if (attempts >= 5) {
+        if (attempts >= 20) {
           throw new Error(`App serve test failed, ${error}`);
         }
         console.log(`App serve failed, trying again, ${error}`);
diff --git a/packages/e2e-test/src/lib/helpers.ts b/packages/e2e-test/src/lib/helpers.ts
index f326311f07..5193db08ec 100644
--- a/packages/e2e-test/src/lib/helpers.ts
+++ b/packages/e2e-test/src/lib/helpers.ts
@@ -25,9 +25,6 @@ import { promisify } from 'util';
 
 const execFile = promisify(execFileCb);
 
-const EXPECTED_LOAD_ERRORS =
-  /ECONNREFUSED|ECONNRESET|did not get to load all resources/;
-
 export function spawnPiped(cmd: string[], options?: SpawnOptions) {
   function pipeWithPrefix(stream: NodeJS.WriteStream, prefix = '') {
     return (data: Buffer) => {
@@ -131,16 +128,19 @@ export async function waitForPageWithText(
   browser: any,
   path: string,
   text: string,
-  { intervalMs = 1000, maxLoadAttempts = 50 } = {},
+  { intervalMs = 1000, maxFindAttempts = 50 } = {},
 ) {
-  let loadAttempts = 0;
+  let findAttempts = 0;
   for (;;) {
     try {
-      const waitTimeMs = intervalMs * (Math.log10(loadAttempts + 1) + 1);
+      const waitTimeMs = intervalMs * (findAttempts + 1);
       console.log(`Attempting to load page at ${path}, waiting ${waitTimeMs}`);
       await new Promise(resolve => setTimeout(resolve, waitTimeMs));
+
       await browser.visit(path);
 
+      await new Promise(resolve => setTimeout(resolve, waitTimeMs));
+
       const escapedText = text.replace(/"|\\/g, '\\$&');
       browser.assert.evaluate(
         `Array.from(document.querySelectorAll("*")).some(el => el.textContent === "${escapedText}")`,
@@ -150,15 +150,12 @@ export async function waitForPageWithText(
       break;
     } catch (error) {
       assertError(error);
-      if (error.message.match(EXPECTED_LOAD_ERRORS)) {
-        loadAttempts++;
-        if (loadAttempts >= maxLoadAttempts) {
-          throw new Error(
-            `Failed to load page '${path}', max number of attempts reached`,
-          );
-        }
-      } else {
-        throw error;
+
+      findAttempts++;
+      if (findAttempts >= maxFindAttempts) {
+        throw new Error(
+          `Failed to load page '${path}', max number of attempts reached`,
+        );
       }
     }
   }