diff --git a/ws-tests/sanity/tests/workspace/archive.spec.ts b/ws-tests/sanity/tests/workspace/archive.spec.ts
index d284e78cac..8dbb993055 100644
--- a/ws-tests/sanity/tests/workspace/archive.spec.ts
+++ b/ws-tests/sanity/tests/workspace/archive.spec.ts
@@ -66,6 +66,10 @@ test.describe('Workspace Archive tests', () => {
       await loginPage2.goto()
       await loginPage2.login('admin', '1234')
 
+      await loginPage2.page.waitForURL((url) => {
+        return url.pathname.startsWith('/login/selectWorkspace') || url.pathname.startsWith('/workbench/')
+      })
+
       const adminPage = new AdminPage(page2)
       await adminPage.gotoAdmin()
 
diff --git a/ws-tests/sanity/tests/workspace/create.spec.ts b/ws-tests/sanity/tests/workspace/create.spec.ts
index 17c055e987..212d588432 100644
--- a/ws-tests/sanity/tests/workspace/create.spec.ts
+++ b/ws-tests/sanity/tests/workspace/create.spec.ts
@@ -189,6 +189,9 @@ test.describe('Workspace tests', () => {
 
       const signUpPage2 = new SignUpPage(page2)
       await signUpPage2.signUp(newUser2)
+      await page2.waitForURL((url) => {
+        return url.pathname.startsWith('/login/createWorkspace')
+      })
 
       // Ok we signed in, and no workspace present.
       await page2.goto(linkText ?? '')
diff --git a/ws-tests/sanity/tests/workspace/migrate.spec.ts b/ws-tests/sanity/tests/workspace/migrate.spec.ts
index 7837add89e..1008b54a99 100644
--- a/ws-tests/sanity/tests/workspace/migrate.spec.ts
+++ b/ws-tests/sanity/tests/workspace/migrate.spec.ts
@@ -65,6 +65,10 @@ test.describe('Workspace Migration tests', () => {
       await loginPage2.goto()
       await loginPage2.login('admin', '1234')
 
+      await loginPage2.page.waitForURL((url) => {
+        return url.pathname.startsWith('/login/selectWorkspace') || url.pathname.startsWith('/workbench/')
+      })
+
       const adminPage = new AdminPage(page2)
       await adminPage.gotoAdmin()