diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-order-searching.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-order-searching.test.js
index 0d270057952..b56ea2bb87c 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-order-searching.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-order-searching.test.js
@@ -10,16 +10,14 @@ const {
 	searchForOrder,
 	createSimpleProduct,
 	addProductToOrder,
-	evalAndClick,
+	clickUpdateOrder,
 } = require( '@woocommerce/e2e-utils' );
 
-let orderId;
-
 const runOrderSearchingTest = () => {
 	describe('WooCommerce Orders > Search orders', () => {
+		let orderId;
 		beforeAll(async () => {
 			await merchant.login();
-
 			await createSimpleProduct('Wanted Product');
 
 			// Create new order for testing
@@ -43,97 +41,90 @@ const runOrderSearchingTest = () => {
 			await page.keyboard.press('Enter');
 			await selectOptionInSelect2('New York', 'input.select2-search__field');
 
-			// Save new order
-			await page.waitFor(1000); // to avoid flakiness
-			await page.click('button.save_order');
-			await page.waitFor(2000); // to avoid flakiness
-			await page.waitForSelector('#message');
-
 			// Get the post id
 			const variablePostId = await page.$('#post_ID');
 			orderId = (await(await variablePostId.getProperty('value')).jsonValue());
 
-			await merchant.openAllOrdersView();
-
+			// Save new order
+			await clickUpdateOrder('Order updated.', true);
 			await addProductToOrder(orderId, 'Wanted Product');
-
 			await merchant.openAllOrdersView();
 		});
 
 		it('can search for order by order id', async () => {
-			await searchForOrder(orderId, orderId);
+			await searchForOrder(orderId, orderId, 'John Doe');
 		});
 
 		it('can search for order by billing first name', async () => {
-			await searchForOrder('John', orderId);
+			await searchForOrder('John', orderId, 'John Doe');
 		})
 
 		it('can search for order by billing last name', async () => {
-			await searchForOrder('Doe', orderId);
+			await searchForOrder('Doe', orderId, 'John Doe');
 		})
 
 		it('can search for order by billing company name', async () => {
-			await searchForOrder('Automattic', orderId);
+			await searchForOrder('Automattic', orderId, 'John Doe');
 		})
 
 		it('can search for order by billing first address', async () => {
-			await searchForOrder('addr 1', orderId);
+			await searchForOrder('addr 1', orderId, 'John Doe');
 		})
 
 		it('can search for order by billing second address', async () => {
-			await searchForOrder('addr 2', orderId);
+			await searchForOrder('addr 2', orderId, 'John Doe');
 		})
 
 		it('can search for order by billing city name', async () => {
-			await searchForOrder('San Francisco', orderId);
+			await searchForOrder('San Francisco', orderId, 'John Doe');
 		})
 
 		it('can search for order by billing post code', async () => {
-			await searchForOrder('94107', orderId);
+			await searchForOrder('94107', orderId, 'John Doe');
 		})
 
 		it('can search for order by billing email', async () => {
-			await searchForOrder('john.doe@example.com', orderId);
+			await searchForOrder('john.doe@example.com', orderId, 'John Doe');
 		})
 
 		it('can search for order by billing phone', async () => {
-			await searchForOrder('123456789', orderId);
+			await searchForOrder('123456789', orderId, 'John Doe');
 		})
 
 		it('can search for order by billing state', async () => {
-			await searchForOrder('CA', orderId);
+			await searchForOrder('CA', orderId, 'John Doe');
 		})
 
 		it('can search for order by shipping first name', async () => {
-			await searchForOrder('Tim', orderId);
+			await searchForOrder('Tim', orderId, 'John Doe');
 		})
 
 		it('can search for order by shipping last name', async () => {
-			await searchForOrder('Clark', orderId);
+			await searchForOrder('Clark', orderId, 'John Doe');
 		})
 
 		it('can search for order by shipping first address', async () => {
-			await searchForOrder('Oxford Ave', orderId);
+			await searchForOrder('Oxford Ave', orderId, 'John Doe');
 		})
 
 		it('can search for order by shipping second address', async () => {
-			await searchForOrder('Linwood Ave', orderId);
+			await searchForOrder('Linwood Ave', orderId, 'John Doe');
 		})
 
 		it('can search for order by shipping city name', async () => {
-			await searchForOrder('Buffalo', orderId);
+			await searchForOrder('Buffalo', orderId, 'John Doe');
 		})
 
 		it('can search for order by shipping postcode name', async () => {
-			await searchForOrder('14201', orderId);
+			await searchForOrder('14201', orderId, 'John Doe');
 		})
 
 		it('can search for order by shipping state name', async () => {
-			await searchForOrder('NY', orderId);
+			await searchForOrder('NY', orderId, 'John Doe');
 		})
 
 		it('can search for order by item name', async () => {
-			await searchForOrder('Wanted Product', orderId);
+			await searchForOrder('Wanted Product', orderId, 'John Doe');
 		})
 	});
 };
diff --git a/tests/e2e/utils/src/components.js b/tests/e2e/utils/src/components.js
index 14bbecb1ac4..990a20d1501 100644
--- a/tests/e2e/utils/src/components.js
+++ b/tests/e2e/utils/src/components.js
@@ -522,6 +522,6 @@ export {
 	addProductToOrder,
 	createCoupon,
 	createSimpleProductWithCategory,
-  clickUpdateOrder,
+	clickUpdateOrder,
 	deleteAllEmailLogs,
 };
diff --git a/tests/e2e/utils/src/page-utils.js b/tests/e2e/utils/src/page-utils.js
index 6da27546b10..9b7dabd276c 100644
--- a/tests/e2e/utils/src/page-utils.js
+++ b/tests/e2e/utils/src/page-utils.js
@@ -215,14 +215,15 @@ const selectOptionInSelect2 = async ( value, selector = 'input.select2-search__f
  *
  * @param {string} value Value to be entered into the search field
  * @param {string} orderId Order ID
- * @param {string} customerName Customer's full name attached to order ID. Defaults to John Doe.
+ * @param {string} customerName Customer's full name attached to order ID.
  */
-const searchForOrder = async (value, orderId, customerName = 'John Doe') => {
+const searchForOrder = async (value, orderId, customerName) => {
 	await clearAndFillInput('#post-search-input', value);
 	await expect(page).toMatchElement('#post-search-input', value);
 	await expect(page).toClick('#search-submit');
 	await page.waitForSelector('#the-list');
-	await expect(page).toMatchElement('.order_number > a.order-view', {text: '#'+orderId+' '+customerName});
+	await page.waitFor(1000);
+	await expect(page).toMatchElement('.order_number > a.order-view', {text: `#${orderId} ${customerName}`});
 };
 
 /**