diff --git a/website/tests/pages/edit/edit.page.ts b/website/tests/pages/edit/edit.page.ts
index 1c9c61dec..dd03aafbd 100644
--- a/website/tests/pages/edit/edit.page.ts
+++ b/website/tests/pages/edit/edit.page.ts
@@ -14,9 +14,7 @@ export class EditPage {
     }
 
     public async goto(accessionVersion: AccessionVersion) {
-        await this.page.goto(`${baseUrl}${routes.editPage(dummyOrganism.key, accessionVersion)}`, {
-            waitUntil: 'networkidle',
-        });
+        await this.page.goto(`${baseUrl}${routes.editPage(dummyOrganism.key, accessionVersion)}`);
     }
 
     public async submit(groupId: number) {
diff --git a/website/tests/pages/review/review.page.ts b/website/tests/pages/review/review.page.ts
index f7e960ad3..4bf60d18d 100644
--- a/website/tests/pages/review/review.page.ts
+++ b/website/tests/pages/review/review.page.ts
@@ -25,9 +25,7 @@ export class ReviewPage {
     }
 
     public async goto(groupId: number) {
-        await this.page.goto(`${baseUrl}${routes.userSequenceReviewPage(dummyOrganism.key, groupId)}`, {
-            waitUntil: 'networkidle',
-        });
+        await this.page.goto(`${baseUrl}${routes.userSequenceReviewPage(dummyOrganism.key, groupId)}`);
     }
 
     public async getReviewPageOverview(): Promise<ReviewPageOverview> {
diff --git a/website/tests/pages/revise/revise.page.ts b/website/tests/pages/revise/revise.page.ts
index 3816c597f..5d2f50ee1 100644
--- a/website/tests/pages/revise/revise.page.ts
+++ b/website/tests/pages/revise/revise.page.ts
@@ -17,9 +17,7 @@ export class RevisePage {
     }
 
     public async goto(groupId: number) {
-        await this.page.goto(`${baseUrl}${routes.revisePage(dummyOrganism.key, groupId)}`, {
-            waitUntil: 'networkidle',
-        });
+        await this.page.goto(`${baseUrl}${routes.revisePage(dummyOrganism.key, groupId)}`);
     }
 
     public async uploadSequenceData(file: string = sequencesTestFile) {
diff --git a/website/tests/pages/sequences/sequences.page.ts b/website/tests/pages/sequences/sequences.page.ts
index 025aa203d..f02d0a16d 100644
--- a/website/tests/pages/sequences/sequences.page.ts
+++ b/website/tests/pages/sequences/sequences.page.ts
@@ -24,9 +24,7 @@ export class SequencePage {
     }
 
     public async goto(accessionVersion: AccessionVersion) {
-        await this.page.goto(`${baseUrl}${routes.sequencesDetailsPage(accessionVersion)}`, {
-            waitUntil: 'networkidle',
-        });
+        await this.page.goto(`${baseUrl}${routes.sequencesDetailsPage(accessionVersion)}`);
         await expect(this.page).toHaveTitle(getAccessionVersionString(accessionVersion));
     }
 
diff --git a/website/tests/pages/submission/submit.page.ts b/website/tests/pages/submission/submit.page.ts
index c4c1362d5..33c4e663b 100644
--- a/website/tests/pages/submission/submit.page.ts
+++ b/website/tests/pages/submission/submit.page.ts
@@ -22,9 +22,7 @@ export class SubmitPage {
     }
 
     public async goto(groupId: number) {
-        await this.page.goto(`${baseUrl}${routes.submitPage(dummyOrganism.key, groupId)}`, {
-            waitUntil: 'networkidle',
-        });
+        await this.page.goto(`${baseUrl}${routes.submitPage(dummyOrganism.key, groupId)}`);
     }
 
     public async uploadMetadata() {
diff --git a/website/tests/pages/user/group/group.page.ts b/website/tests/pages/user/group/group.page.ts
index 4c3f1dfed..248330ad6 100644
--- a/website/tests/pages/user/group/group.page.ts
+++ b/website/tests/pages/user/group/group.page.ts
@@ -7,7 +7,7 @@ export class GroupPage {
     constructor(public readonly page: Page) {}
 
     public async goToUserPage() {
-        await this.page.goto(`${baseUrl}${routes.userOverviewPage()}`, { waitUntil: 'networkidle' });
+        await this.page.goto(`${baseUrl}${routes.userOverviewPage()}`, { waitUntil: 'load' });
         await this.page.waitForURL(`${baseUrl}${routes.userOverviewPage()}`);
     }
 
@@ -17,9 +17,7 @@ export class GroupPage {
     }
 
     public async goToGroupPage(groupId: number) {
-        await this.page.goto(`${baseUrl}${routes.groupOverviewPage(groupId)}`, {
-            waitUntil: 'networkidle',
-        });
+        await this.page.goto(`${baseUrl}${routes.groupOverviewPage(groupId)}`);
         await this.page.waitForURL(`${baseUrl}${routes.groupOverviewPage(groupId)}`);
     }
 
diff --git a/website/tests/pages/user/userPage/userPage.ts b/website/tests/pages/user/userPage/userPage.ts
index d17bbdb2d..73a372428 100644
--- a/website/tests/pages/user/userPage/userPage.ts
+++ b/website/tests/pages/user/userPage/userPage.ts
@@ -7,7 +7,7 @@ export class UserPage {
     constructor(public readonly page: Page) {}
 
     public async goToUserPage() {
-        await this.page.goto(`${baseUrl}${routes.userOverviewPage()}`, { waitUntil: 'networkidle' });
+        await this.page.goto(`${baseUrl}${routes.userOverviewPage()}`, { waitUntil: 'load' });
         await this.page.waitForURL(`${baseUrl}${routes.userOverviewPage()}`);
     }