diff --git a/packages/calypso-e2e/src/lib/pages/signup/user-signup-page.ts b/packages/calypso-e2e/src/lib/pages/signup/user-signup-page.ts
index 31b8b19c4fb19..ae72f0aa21e78 100644
--- a/packages/calypso-e2e/src/lib/pages/signup/user-signup-page.ts
+++ b/packages/calypso-e2e/src/lib/pages/signup/user-signup-page.ts
@@ -154,10 +154,13 @@ export class UserSignupPage {
 	async signupWoo( email: string ): Promise< NewUserResponse > {
 		await this.page.fill( selectors.emailInput, email );
 
-		const [ , response ] = await Promise.all( [
-			this.page.waitForURL( /.*woocommerce\.com*/, { waitUntil: 'networkidle' } ),
-			this.page.waitForResponse( /.*new\?.*/ ),
+		const [ response ] = await Promise.all( [
+			this.page.waitForResponse( /.*users\/new\?.*/ ),
 			this.page.click( selectors.submitButton ),
+			this.page.waitForURL( /.*woocommerce\.com*/, {
+				waitUntil: 'networkidle',
+				timeout: 25000,
+			} ),
 		] );
 
 		if ( ! response ) {
diff --git a/test/e2e/specs/onboarding/signup__woo-email.ts b/test/e2e/specs/onboarding/signup__woo-email.ts
index 6bd978f2b7e63..048241f263ce5 100644
--- a/test/e2e/specs/onboarding/signup__woo-email.ts
+++ b/test/e2e/specs/onboarding/signup__woo-email.ts
@@ -55,7 +55,7 @@ describe(
 			} );
 
 			it( 'Activate account', async function () {
-				await page.goto( activationLink, { waitUntil: 'networkidle' } );
+				await page.goto( activationLink, { waitUntil: 'networkidle', timeout: 25000 } );
 			} );
 		} );