diff --git a/tools/e2e-commons/pages/wp-admin/blocks/simple-payments.js b/tools/e2e-commons/pages/wp-admin/blocks/simple-payments.js
index b6639ce46d01b..9689334adc19d 100644
--- a/tools/e2e-commons/pages/wp-admin/blocks/simple-payments.js
+++ b/tools/e2e-commons/pages/wp-admin/blocks/simple-payments.js
@@ -35,9 +35,9 @@ export default class SimplePaymentBlock extends PageActions {
 	}
 
 	async waitForResponse() {
-		const testUrl = /^https?:\/\/.*%2Fwp%2Fv2%2Fjp_pay_product/;
-
-		await this.page.waitForResponse( resp => testUrl.test( resp.url() ) );
+		await this.page.waitForResponse(
+			r => decodeURIComponent( r.url() ).match( /jp_pay_product/ ) && r.status() === 200
+		);
 	}
 
 	getSelector( selector ) {
diff --git a/tools/e2e-commons/pages/wp-admin/blocks/tilled-gallery.js b/tools/e2e-commons/pages/wp-admin/blocks/tilled-gallery.js
index 8a34769f0d77f..89245dec97189 100644
--- a/tools/e2e-commons/pages/wp-admin/blocks/tilled-gallery.js
+++ b/tools/e2e-commons/pages/wp-admin/blocks/tilled-gallery.js
@@ -33,9 +33,9 @@ export default class TiledGallery extends PageActions {
 	}
 
 	async waitForResponse() {
-		const testUrl = /^https?:\/\/.*%2Fwp%2Fv2%2Fmedia/;
-
-		await this.page.waitForResponse( resp => testUrl.test( resp.url() ) );
+		await this.page.waitForResponse(
+			r => decodeURIComponent( r.url() ).match( /wp\/v2\/media/ ) && r.status() === 200
+		);
 	}
 
 	async linkToAttachment() {