diff --git a/tests/e2e/utils/src/components.js b/tests/e2e/utils/src/components.js
index 31e13bd4694..d4f6c77b29c 100644
--- a/tests/e2e/utils/src/components.js
+++ b/tests/e2e/utils/src/components.js
@@ -93,7 +93,7 @@ const completeOnboardingWizard = async () => {
 	expect( industryCheckboxes ).toHaveLength( 9 );
 
 	// Select all industries including "Other"
-	for ( let i = 0; i < 10; i++ ) {
+	for ( let i = 0; i < 9; i++ ) {
 		await industryCheckboxes[i].click();
 	}
 
@@ -149,9 +149,14 @@ const completeOnboardingWizard = async () => {
 	await page.waitForSelector( '.woocommerce-select-control__control' );
 	await expect( page ).toClick( '.woocommerce-select-control__option', { text: config.get( 'onboardingwizard.sellingelsewhere' ) } );
 
-	// Disable business extension downloads
-	const pluginToggle = await page.$( '.woocommerce-business-extensions .components-checkbox-control__input-container' );
-	pluginToggle.click();
+	// Query for the extensions toggles
+	const extensionsToggles = await page.$$( '.components-form-toggle__input' );
+	expect( extensionsToggles ).toHaveLength( 3 );
+
+	// Disable download of the 3 extensions
+	for ( let i = 0; i < 3; i++ ) {
+		await extensionsToggles[i].click();
+	}
 
 	// Wait for "Continue" button to become active
 	await page.waitForSelector( 'button.is-primary:not(:disabled)' );