diff --git a/plugins/woocommerce-blocks/.github/workflows/php-js-e2e-tests.yml b/plugins/woocommerce-blocks/.github/workflows/php-js-e2e-tests.yml
index 157d3e00244..3000500b053 100644
--- a/plugins/woocommerce-blocks/.github/workflows/php-js-e2e-tests.yml
+++ b/plugins/woocommerce-blocks/.github/workflows/php-js-e2e-tests.yml
@@ -153,6 +153,7 @@ jobs:
         env:
           WOOCOMMERCE_BLOCKS_PHASE: 3
         run: |
+          node ./bin/wp-env-with-wp-622.js
           npm run wp-env start
           npm run wp-env:config && npx cross-env NODE_CONFIG_DIR=tests/e2e-jest/config wp-scripts test-e2e --config tests/e2e-jest/config/jest.config.js --listTests > ~/.jest-e2e-tests
           npx cross-env JEST_PUPPETEER_CONFIG=tests/e2e-jest/config/jest-puppeteer.config.js cross-env NODE_CONFIG_DIR=tests/e2e-jest/config wp-scripts test-e2e --config tests/e2e-jest/config/jest.config.js --runInBand --runTestsByPath $( awk 'NR % 5 == ${{ matrix.part }} - 1' < ~/.jest-e2e-tests )
diff --git a/plugins/woocommerce-blocks/.wp-env.json b/plugins/woocommerce-blocks/.wp-env.json
index c3a5c2d1d6a..d290c174e0d 100644
--- a/plugins/woocommerce-blocks/.wp-env.json
+++ b/plugins/woocommerce-blocks/.wp-env.json
@@ -1,5 +1,5 @@
 {
-	"core": "WordPress/WordPress#6.2.2",
+	"core": null,
 	"plugins": [
 		"https://downloads.wordpress.org/plugin/woocommerce.latest-stable.zip",
 		"https://github.com/WP-API/Basic-Auth/archive/master.zip",
diff --git a/plugins/woocommerce-blocks/bin/wp-env-with-wp-622.js b/plugins/woocommerce-blocks/bin/wp-env-with-wp-622.js
new file mode 100755
index 00000000000..b27fbfcb2e9
--- /dev/null
+++ b/plugins/woocommerce-blocks/bin/wp-env-with-wp-622.js
@@ -0,0 +1,19 @@
+const fs = require( 'fs' );
+const path = require( 'path' );
+
+const wpEnvRaw = fs.readFileSync(
+	path.join( __dirname, '..', '.wp-env.json' )
+);
+const wpEnv = JSON.parse( wpEnvRaw );
+
+// Pin the core version to 6.2.2 for Jest E2E test so we can keep the test
+// passing when new WordPress versions are released. We do this because we're
+// moving to Playwright and will abandon the Jest E2E tests once the migration
+// is complete.
+wpEnv.core = 'WordPress/WordPress#6.2.2';
+
+// We write the new file to .wp-env.override.json (https://developer.wordpress.org/block-editor/reference-guides/packages/packages-env/#wp-env-override-json)
+fs.writeFileSync(
+	path.join( __dirname, '..', '.wp-env.override.json' ),
+	JSON.stringify( wpEnv )
+);
diff --git a/plugins/woocommerce-blocks/package-lock.json b/plugins/woocommerce-blocks/package-lock.json
index 351f91268d4..613131a9004 100644
--- a/plugins/woocommerce-blocks/package-lock.json
+++ b/plugins/woocommerce-blocks/package-lock.json
@@ -115,7 +115,7 @@
 				"@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
 				"@wordpress/dom": "3.27.0",
 				"@wordpress/e2e-test-utils": "10.1.0",
-				"@wordpress/e2e-test-utils-playwright": "https://github.com/woocommerce/woocommerce-blocks/files/11286971/wordpress-e2e-test-utils-playwright-0.0.0.tgz",
+				"@wordpress/e2e-test-utils-playwright": "0.6.0",
 				"@wordpress/e2e-tests": "^4.6.0",
 				"@wordpress/element": "4.20.0",
 				"@wordpress/env": "7.0.0",
@@ -126,6 +126,7 @@
 				"@wordpress/scripts": "24.6.0",
 				"autoprefixer": "10.4.14",
 				"axios": "0.27.2",
+				"babel-jest": "^29.6.2",
 				"babel-plugin-explicit-exports-references": "^1.0.2",
 				"babel-plugin-react-docgen": "4.2.1",
 				"babel-plugin-transform-async-generator-functions": "6.24.1",
@@ -15391,9 +15392,9 @@
 			}
 		},
 		"node_modules/@wordpress/e2e-test-utils-playwright": {
-			"version": "0.0.0",
-			"resolved": "https://github.com/woocommerce/woocommerce-blocks/files/11286971/wordpress-e2e-test-utils-playwright-0.0.0.tgz",
-			"integrity": "sha512-BLtq8Vcsyxbac1d8I+klE2Zrhbso3DJ2YTRl3ZmZ6KMiIiYWCvPLLIbtYAWiIDy6NU2jiT1wLlJ4G4jyV3DhIQ==",
+			"version": "0.6.0",
+			"resolved": "https://github.com/woocommerce/woocommerce-blocks/files/12309320/wordpress-e2e-test-utils-playwright-0.6.0.tgz",
+			"integrity": "sha512-5lo8iRuRfUOAPMRsQteSkKyMoP1IHHu6GKye8Df+YEPz1LWXcS6YRFGI3HrONBpcaHLrJC7LVav4UdB/sBPqUw==",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -16127,6 +16128,68 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/@wordpress/e2e-tests/node_modules/babel-jest": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+			"integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/transform": "^27.5.1",
+				"@jest/types": "^27.5.1",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.1.1",
+				"babel-preset-jest": "^27.5.1",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.8.0"
+			}
+		},
+		"node_modules/@wordpress/e2e-tests/node_modules/babel-jest/node_modules/slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@wordpress/e2e-tests/node_modules/babel-plugin-jest-hoist": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+			"integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.0.0",
+				"@types/babel__traverse": "^7.0.6"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@wordpress/e2e-tests/node_modules/babel-preset-jest": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+			"integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+			"dev": true,
+			"dependencies": {
+				"babel-plugin-jest-hoist": "^27.5.1",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
 		"node_modules/@wordpress/e2e-tests/node_modules/ci-info": {
 			"version": "3.3.2",
 			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.2.tgz",
@@ -17389,6 +17452,68 @@
 				"react-dom": "^17.0.0"
 			}
 		},
+		"node_modules/@wordpress/jest-preset-default/node_modules/babel-jest": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+			"integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/transform": "^27.5.1",
+				"@jest/types": "^27.5.1",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.1.1",
+				"babel-preset-jest": "^27.5.1",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.8.0"
+			}
+		},
+		"node_modules/@wordpress/jest-preset-default/node_modules/babel-plugin-jest-hoist": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+			"integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.0.0",
+				"@types/babel__traverse": "^7.0.6"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@wordpress/jest-preset-default/node_modules/babel-preset-jest": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+			"integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+			"dev": true,
+			"dependencies": {
+				"babel-plugin-jest-hoist": "^27.5.1",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@wordpress/jest-preset-default/node_modules/slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/@wordpress/jest-puppeteer-axe": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/@wordpress/jest-puppeteer-axe/-/jest-puppeteer-axe-4.0.2.tgz",
@@ -18297,6 +18422,68 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/@wordpress/scripts/node_modules/babel-jest": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+			"integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/transform": "^27.5.1",
+				"@jest/types": "^27.5.1",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.1.1",
+				"babel-preset-jest": "^27.5.1",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.8.0"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/babel-jest/node_modules/slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/babel-plugin-jest-hoist": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+			"integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.0.0",
+				"@types/babel__traverse": "^7.0.6"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/babel-preset-jest": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+			"integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+			"dev": true,
+			"dependencies": {
+				"babel-plugin-jest-hoist": "^27.5.1",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
 		"node_modules/@wordpress/scripts/node_modules/ci-info": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
@@ -21004,27 +21191,150 @@
 			}
 		},
 		"node_modules/babel-jest": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
-			"integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+			"version": "29.6.2",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
+			"integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
 			"dev": true,
 			"dependencies": {
-				"@jest/transform": "^27.5.1",
-				"@jest/types": "^27.5.1",
+				"@jest/transform": "^29.6.2",
 				"@types/babel__core": "^7.1.14",
 				"babel-plugin-istanbul": "^6.1.1",
-				"babel-preset-jest": "^27.5.1",
+				"babel-preset-jest": "^29.5.0",
 				"chalk": "^4.0.0",
 				"graceful-fs": "^4.2.9",
 				"slash": "^3.0.0"
 			},
 			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.8.0"
 			}
 		},
+		"node_modules/babel-jest/node_modules/@jest/transform": {
+			"version": "29.6.2",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+			"integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@jest/types": "^29.6.1",
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"babel-plugin-istanbul": "^6.1.1",
+				"chalk": "^4.0.0",
+				"convert-source-map": "^2.0.0",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.6.2",
+				"jest-regex-util": "^29.4.3",
+				"jest-util": "^29.6.2",
+				"micromatch": "^4.0.4",
+				"pirates": "^4.0.4",
+				"slash": "^3.0.0",
+				"write-file-atomic": "^4.0.2"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/babel-jest/node_modules/@jest/types": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+			"integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/schemas": "^29.6.0",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.8",
+				"chalk": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/babel-jest/node_modules/@types/yargs": {
+			"version": "17.0.24",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+			"integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+			"dev": true,
+			"dependencies": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"node_modules/babel-jest/node_modules/ci-info": {
+			"version": "3.8.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+			"integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-jest/node_modules/convert-source-map": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+			"dev": true
+		},
+		"node_modules/babel-jest/node_modules/jest-haste-map": {
+			"version": "29.6.2",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+			"integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.1",
+				"@types/graceful-fs": "^4.1.3",
+				"@types/node": "*",
+				"anymatch": "^3.0.3",
+				"fb-watchman": "^2.0.0",
+				"graceful-fs": "^4.2.9",
+				"jest-regex-util": "^29.4.3",
+				"jest-util": "^29.6.2",
+				"jest-worker": "^29.6.2",
+				"micromatch": "^4.0.4",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.2"
+			}
+		},
+		"node_modules/babel-jest/node_modules/jest-regex-util": {
+			"version": "29.4.3",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+			"integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+			"dev": true,
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/babel-jest/node_modules/jest-util": {
+			"version": "29.6.2",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+			"integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.1",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"graceful-fs": "^4.2.9",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
 		"node_modules/babel-jest/node_modules/slash": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -21034,6 +21344,19 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/babel-jest/node_modules/write-file-atomic": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+			"dev": true,
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"signal-exit": "^3.0.7"
+			},
+			"engines": {
+				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+			}
+		},
 		"node_modules/babel-loader": {
 			"version": "8.2.5",
 			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
@@ -21265,18 +21588,18 @@
 			}
 		},
 		"node_modules/babel-plugin-jest-hoist": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
-			"integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+			"version": "29.5.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
+			"integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
 			"dev": true,
 			"dependencies": {
 				"@babel/template": "^7.3.3",
 				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.0.0",
+				"@types/babel__core": "^7.1.14",
 				"@types/babel__traverse": "^7.0.6"
 			},
 			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
 		"node_modules/babel-plugin-macros": {
@@ -21498,16 +21821,16 @@
 			}
 		},
 		"node_modules/babel-preset-jest": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
-			"integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+			"version": "29.5.0",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
+			"integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
 			"dev": true,
 			"dependencies": {
-				"babel-plugin-jest-hoist": "^27.5.1",
+				"babel-plugin-jest-hoist": "^29.5.0",
 				"babel-preset-current-node-syntax": "^1.0.0"
 			},
 			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.0.0"
@@ -33616,6 +33939,59 @@
 				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
 			}
 		},
+		"node_modules/jest-cli/node_modules/babel-jest": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+			"integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/transform": "^27.5.1",
+				"@jest/types": "^27.5.1",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.1.1",
+				"babel-preset-jest": "^27.5.1",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.8.0"
+			}
+		},
+		"node_modules/jest-cli/node_modules/babel-plugin-jest-hoist": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+			"integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.0.0",
+				"@types/babel__traverse": "^7.0.6"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-cli/node_modules/babel-preset-jest": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+			"integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+			"dev": true,
+			"dependencies": {
+				"babel-plugin-jest-hoist": "^27.5.1",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
 		"node_modules/jest-cli/node_modules/ci-info": {
 			"version": "3.3.1",
 			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.1.tgz",
@@ -34225,58 +34601,6 @@
 				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"node_modules/jest-config/node_modules/babel-jest": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz",
-			"integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==",
-			"dev": true,
-			"dependencies": {
-				"@jest/transform": "^29.5.0",
-				"@types/babel__core": "^7.1.14",
-				"babel-plugin-istanbul": "^6.1.1",
-				"babel-preset-jest": "^29.5.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.8.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/babel-plugin-jest-hoist": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
-			"integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
-			"dev": true,
-			"dependencies": {
-				"@babel/template": "^7.3.3",
-				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.1.14",
-				"@types/babel__traverse": "^7.0.6"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/babel-preset-jest": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
-			"integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
-			"dev": true,
-			"dependencies": {
-				"babel-plugin-jest-hoist": "^29.5.0",
-				"babel-preset-current-node-syntax": "^1.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
 		"node_modules/jest-config/node_modules/ci-info": {
 			"version": "3.8.0",
 			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
@@ -36677,13 +37001,13 @@
 			}
 		},
 		"node_modules/jest-worker": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
-			"integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
+			"version": "29.6.2",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+			"integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
 			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
-				"jest-util": "^29.5.0",
+				"jest-util": "^29.6.2",
 				"merge-stream": "^2.0.0",
 				"supports-color": "^8.0.0"
 			},
@@ -36692,12 +37016,12 @@
 			}
 		},
 		"node_modules/jest-worker/node_modules/@jest/types": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
-			"integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+			"integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
 			"dev": true,
 			"dependencies": {
-				"@jest/schemas": "^29.4.3",
+				"@jest/schemas": "^29.6.0",
 				"@types/istanbul-lib-coverage": "^2.0.0",
 				"@types/istanbul-reports": "^3.0.0",
 				"@types/node": "*",
@@ -36733,12 +37057,12 @@
 			}
 		},
 		"node_modules/jest-worker/node_modules/jest-util": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
-			"integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
+			"version": "29.6.2",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+			"integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
 			"dev": true,
 			"dependencies": {
-				"@jest/types": "^29.5.0",
+				"@jest/types": "^29.6.1",
 				"@types/node": "*",
 				"chalk": "^4.0.0",
 				"ci-info": "^3.2.0",
@@ -65605,8 +65929,9 @@
 			}
 		},
 		"@wordpress/e2e-test-utils-playwright": {
-			"version": "https://github.com/woocommerce/woocommerce-blocks/files/11286971/wordpress-e2e-test-utils-playwright-0.0.0.tgz",
-			"integrity": "sha512-BLtq8Vcsyxbac1d8I+klE2Zrhbso3DJ2YTRl3ZmZ6KMiIiYWCvPLLIbtYAWiIDy6NU2jiT1wLlJ4G4jyV3DhIQ==",
+			"version": "0.6.0",
+			"resolved": "https://github.com/woocommerce/woocommerce-blocks/files/12309320/wordpress-e2e-test-utils-playwright-0.6.0.tgz",
+			"integrity": "sha512-5lo8iRuRfUOAPMRsQteSkKyMoP1IHHu6GKye8Df+YEPz1LWXcS6YRFGI3HrONBpcaHLrJC7LVav4UdB/sBPqUw==",
 			"dev": true,
 			"requires": {
 				"@wordpress/api-fetch": "file:../api-fetch",
@@ -66177,6 +66502,52 @@
 					"integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
 					"dev": true
 				},
+				"babel-jest": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+					"integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+					"dev": true,
+					"requires": {
+						"@jest/transform": "^27.5.1",
+						"@jest/types": "^27.5.1",
+						"@types/babel__core": "^7.1.14",
+						"babel-plugin-istanbul": "^6.1.1",
+						"babel-preset-jest": "^27.5.1",
+						"chalk": "^4.0.0",
+						"graceful-fs": "^4.2.9",
+						"slash": "^3.0.0"
+					},
+					"dependencies": {
+						"slash": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+							"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+							"dev": true
+						}
+					}
+				},
+				"babel-plugin-jest-hoist": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+					"integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+					"dev": true,
+					"requires": {
+						"@babel/template": "^7.3.3",
+						"@babel/types": "^7.3.3",
+						"@types/babel__core": "^7.0.0",
+						"@types/babel__traverse": "^7.0.6"
+					}
+				},
+				"babel-preset-jest": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+					"integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+					"dev": true,
+					"requires": {
+						"babel-plugin-jest-hoist": "^27.5.1",
+						"babel-preset-current-node-syntax": "^1.0.0"
+					}
+				},
 				"ci-info": {
 					"version": "3.3.2",
 					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.2.tgz",
@@ -67058,6 +67429,52 @@
 				"babel-jest": "^27.4.5",
 				"enzyme": "^3.11.0",
 				"enzyme-to-json": "^3.4.4"
+			},
+			"dependencies": {
+				"babel-jest": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+					"integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+					"dev": true,
+					"requires": {
+						"@jest/transform": "^27.5.1",
+						"@jest/types": "^27.5.1",
+						"@types/babel__core": "^7.1.14",
+						"babel-plugin-istanbul": "^6.1.1",
+						"babel-preset-jest": "^27.5.1",
+						"chalk": "^4.0.0",
+						"graceful-fs": "^4.2.9",
+						"slash": "^3.0.0"
+					}
+				},
+				"babel-plugin-jest-hoist": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+					"integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+					"dev": true,
+					"requires": {
+						"@babel/template": "^7.3.3",
+						"@babel/types": "^7.3.3",
+						"@types/babel__core": "^7.0.0",
+						"@types/babel__traverse": "^7.0.6"
+					}
+				},
+				"babel-preset-jest": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+					"integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+					"dev": true,
+					"requires": {
+						"babel-plugin-jest-hoist": "^27.5.1",
+						"babel-preset-current-node-syntax": "^1.0.0"
+					}
+				},
+				"slash": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+					"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+					"dev": true
+				}
 			}
 		},
 		"@wordpress/jest-puppeteer-axe": {
@@ -67760,6 +68177,52 @@
 					"integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
 					"dev": true
 				},
+				"babel-jest": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+					"integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+					"dev": true,
+					"requires": {
+						"@jest/transform": "^27.5.1",
+						"@jest/types": "^27.5.1",
+						"@types/babel__core": "^7.1.14",
+						"babel-plugin-istanbul": "^6.1.1",
+						"babel-preset-jest": "^27.5.1",
+						"chalk": "^4.0.0",
+						"graceful-fs": "^4.2.9",
+						"slash": "^3.0.0"
+					},
+					"dependencies": {
+						"slash": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+							"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+							"dev": true
+						}
+					}
+				},
+				"babel-plugin-jest-hoist": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+					"integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+					"dev": true,
+					"requires": {
+						"@babel/template": "^7.3.3",
+						"@babel/types": "^7.3.3",
+						"@types/babel__core": "^7.0.0",
+						"@types/babel__traverse": "^7.0.6"
+					}
+				},
+				"babel-preset-jest": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+					"integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+					"dev": true,
+					"requires": {
+						"babel-plugin-jest-hoist": "^27.5.1",
+						"babel-preset-current-node-syntax": "^1.0.0"
+					}
+				},
 				"ci-info": {
 					"version": "3.3.0",
 					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
@@ -69790,26 +70253,133 @@
 			}
 		},
 		"babel-jest": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
-			"integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+			"version": "29.6.2",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
+			"integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
 			"dev": true,
 			"requires": {
-				"@jest/transform": "^27.5.1",
-				"@jest/types": "^27.5.1",
+				"@jest/transform": "^29.6.2",
 				"@types/babel__core": "^7.1.14",
 				"babel-plugin-istanbul": "^6.1.1",
-				"babel-preset-jest": "^27.5.1",
+				"babel-preset-jest": "^29.5.0",
 				"chalk": "^4.0.0",
 				"graceful-fs": "^4.2.9",
 				"slash": "^3.0.0"
 			},
 			"dependencies": {
+				"@jest/transform": {
+					"version": "29.6.2",
+					"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+					"integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+					"dev": true,
+					"requires": {
+						"@babel/core": "^7.11.6",
+						"@jest/types": "^29.6.1",
+						"@jridgewell/trace-mapping": "^0.3.18",
+						"babel-plugin-istanbul": "^6.1.1",
+						"chalk": "^4.0.0",
+						"convert-source-map": "^2.0.0",
+						"fast-json-stable-stringify": "^2.1.0",
+						"graceful-fs": "^4.2.9",
+						"jest-haste-map": "^29.6.2",
+						"jest-regex-util": "^29.4.3",
+						"jest-util": "^29.6.2",
+						"micromatch": "^4.0.4",
+						"pirates": "^4.0.4",
+						"slash": "^3.0.0",
+						"write-file-atomic": "^4.0.2"
+					}
+				},
+				"@jest/types": {
+					"version": "29.6.1",
+					"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+					"integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+					"dev": true,
+					"requires": {
+						"@jest/schemas": "^29.6.0",
+						"@types/istanbul-lib-coverage": "^2.0.0",
+						"@types/istanbul-reports": "^3.0.0",
+						"@types/node": "*",
+						"@types/yargs": "^17.0.8",
+						"chalk": "^4.0.0"
+					}
+				},
+				"@types/yargs": {
+					"version": "17.0.24",
+					"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+					"integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+					"dev": true,
+					"requires": {
+						"@types/yargs-parser": "*"
+					}
+				},
+				"ci-info": {
+					"version": "3.8.0",
+					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+					"integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+					"dev": true
+				},
+				"convert-source-map": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+					"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+					"dev": true
+				},
+				"jest-haste-map": {
+					"version": "29.6.2",
+					"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+					"integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+					"dev": true,
+					"requires": {
+						"@jest/types": "^29.6.1",
+						"@types/graceful-fs": "^4.1.3",
+						"@types/node": "*",
+						"anymatch": "^3.0.3",
+						"fb-watchman": "^2.0.0",
+						"fsevents": "^2.3.2",
+						"graceful-fs": "^4.2.9",
+						"jest-regex-util": "^29.4.3",
+						"jest-util": "^29.6.2",
+						"jest-worker": "^29.6.2",
+						"micromatch": "^4.0.4",
+						"walker": "^1.0.8"
+					}
+				},
+				"jest-regex-util": {
+					"version": "29.4.3",
+					"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+					"integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+					"dev": true
+				},
+				"jest-util": {
+					"version": "29.6.2",
+					"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+					"integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+					"dev": true,
+					"requires": {
+						"@jest/types": "^29.6.1",
+						"@types/node": "*",
+						"chalk": "^4.0.0",
+						"ci-info": "^3.2.0",
+						"graceful-fs": "^4.2.9",
+						"picomatch": "^2.2.3"
+					}
+				},
 				"slash": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
 					"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
 					"dev": true
+				},
+				"write-file-atomic": {
+					"version": "4.0.2",
+					"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+					"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+					"dev": true,
+					"requires": {
+						"imurmurhash": "^0.1.4",
+						"signal-exit": "^3.0.7"
+					}
 				}
 			}
 		},
@@ -69989,14 +70559,14 @@
 			}
 		},
 		"babel-plugin-jest-hoist": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
-			"integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+			"version": "29.5.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
+			"integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
 			"dev": true,
 			"requires": {
 				"@babel/template": "^7.3.3",
 				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.0.0",
+				"@types/babel__core": "^7.1.14",
 				"@types/babel__traverse": "^7.0.6"
 			}
 		},
@@ -70199,12 +70769,12 @@
 			}
 		},
 		"babel-preset-jest": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
-			"integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+			"version": "29.5.0",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
+			"integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
 			"dev": true,
 			"requires": {
-				"babel-plugin-jest-hoist": "^27.5.1",
+				"babel-plugin-jest-hoist": "^29.5.0",
 				"babel-preset-current-node-syntax": "^1.0.0"
 			}
 		},
@@ -79547,6 +80117,44 @@
 						"jest-runtime": "^27.5.1"
 					}
 				},
+				"babel-jest": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+					"integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+					"dev": true,
+					"requires": {
+						"@jest/transform": "^27.5.1",
+						"@jest/types": "^27.5.1",
+						"@types/babel__core": "^7.1.14",
+						"babel-plugin-istanbul": "^6.1.1",
+						"babel-preset-jest": "^27.5.1",
+						"chalk": "^4.0.0",
+						"graceful-fs": "^4.2.9",
+						"slash": "^3.0.0"
+					}
+				},
+				"babel-plugin-jest-hoist": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+					"integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+					"dev": true,
+					"requires": {
+						"@babel/template": "^7.3.3",
+						"@babel/types": "^7.3.3",
+						"@types/babel__core": "^7.0.0",
+						"@types/babel__traverse": "^7.0.6"
+					}
+				},
+				"babel-preset-jest": {
+					"version": "27.5.1",
+					"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+					"integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+					"dev": true,
+					"requires": {
+						"babel-plugin-jest-hoist": "^27.5.1",
+						"babel-preset-current-node-syntax": "^1.0.0"
+					}
+				},
 				"ci-info": {
 					"version": "3.3.1",
 					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.1.tgz",
@@ -80017,43 +80625,6 @@
 					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
 					"dev": true
 				},
-				"babel-jest": {
-					"version": "29.5.0",
-					"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz",
-					"integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==",
-					"dev": true,
-					"requires": {
-						"@jest/transform": "^29.5.0",
-						"@types/babel__core": "^7.1.14",
-						"babel-plugin-istanbul": "^6.1.1",
-						"babel-preset-jest": "^29.5.0",
-						"chalk": "^4.0.0",
-						"graceful-fs": "^4.2.9",
-						"slash": "^3.0.0"
-					}
-				},
-				"babel-plugin-jest-hoist": {
-					"version": "29.5.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
-					"integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
-					"dev": true,
-					"requires": {
-						"@babel/template": "^7.3.3",
-						"@babel/types": "^7.3.3",
-						"@types/babel__core": "^7.1.14",
-						"@types/babel__traverse": "^7.0.6"
-					}
-				},
-				"babel-preset-jest": {
-					"version": "29.5.0",
-					"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
-					"integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
-					"dev": true,
-					"requires": {
-						"babel-plugin-jest-hoist": "^29.5.0",
-						"babel-preset-current-node-syntax": "^1.0.0"
-					}
-				},
 				"ci-info": {
 					"version": "3.8.0",
 					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
@@ -81974,24 +82545,24 @@
 			}
 		},
 		"jest-worker": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
-			"integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
+			"version": "29.6.2",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+			"integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
 			"dev": true,
 			"requires": {
 				"@types/node": "*",
-				"jest-util": "^29.5.0",
+				"jest-util": "^29.6.2",
 				"merge-stream": "^2.0.0",
 				"supports-color": "^8.0.0"
 			},
 			"dependencies": {
 				"@jest/types": {
-					"version": "29.5.0",
-					"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
-					"integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
+					"version": "29.6.1",
+					"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+					"integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
 					"dev": true,
 					"requires": {
-						"@jest/schemas": "^29.4.3",
+						"@jest/schemas": "^29.6.0",
 						"@types/istanbul-lib-coverage": "^2.0.0",
 						"@types/istanbul-reports": "^3.0.0",
 						"@types/node": "*",
@@ -82015,12 +82586,12 @@
 					"dev": true
 				},
 				"jest-util": {
-					"version": "29.5.0",
-					"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
-					"integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
+					"version": "29.6.2",
+					"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+					"integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
 					"dev": true,
 					"requires": {
-						"@jest/types": "^29.5.0",
+						"@jest/types": "^29.6.1",
 						"@types/node": "*",
 						"chalk": "^4.0.0",
 						"ci-info": "^3.2.0",
diff --git a/plugins/woocommerce-blocks/package.json b/plugins/woocommerce-blocks/package.json
index f4da41e4d29..ca93ab88a5a 100644
--- a/plugins/woocommerce-blocks/package.json
+++ b/plugins/woocommerce-blocks/package.json
@@ -164,7 +164,7 @@
 		"@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
 		"@wordpress/dom": "3.27.0",
 		"@wordpress/e2e-test-utils": "10.1.0",
-		"@wordpress/e2e-test-utils-playwright": "https://github.com/woocommerce/woocommerce-blocks/files/11286971/wordpress-e2e-test-utils-playwright-0.0.0.tgz",
+		"@wordpress/e2e-test-utils-playwright": "0.6.0",
 		"@wordpress/e2e-tests": "^4.6.0",
 		"@wordpress/element": "4.20.0",
 		"@wordpress/env": "7.0.0",
@@ -175,6 +175,7 @@
 		"@wordpress/scripts": "24.6.0",
 		"autoprefixer": "10.4.14",
 		"axios": "0.27.2",
+		"babel-jest": "^29.6.2",
 		"babel-plugin-explicit-exports-references": "^1.0.2",
 		"babel-plugin-react-docgen": "4.2.1",
 		"babel-plugin-transform-async-generator-functions": "6.24.1",
diff --git a/plugins/woocommerce-blocks/tests/e2e/tests/cart-checkout/cart-block.merchant.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/cart-checkout/cart-block.merchant.block_theme.spec.ts
index 79d6ef0d9c6..9d1edf8cd11 100644
--- a/plugins/woocommerce-blocks/tests/e2e/tests/cart-checkout/cart-block.merchant.block_theme.spec.ts
+++ b/plugins/woocommerce-blocks/tests/e2e/tests/cart-checkout/cart-block.merchant.block_theme.spec.ts
@@ -41,8 +41,9 @@ test.describe( 'Merchant → Cart', () => {
 		test( 'can only be inserted once', async ( { page, editorUtils } ) => {
 			await editorUtils.openGlobalBlockInserter();
 			await page.getByPlaceholder( 'Search' ).fill( blockData.slug );
-			const cartBlockButton = page.locator( 'button', {
-				has: page.locator( `text="${ blockData.name }"` ),
+			const cartBlockButton = page.getByRole( 'option', {
+				name: blockData.name,
+				exact: true,
 			} );
 			await expect( cartBlockButton ).toHaveAttribute(
 				'aria-disabled',
@@ -61,7 +62,9 @@ test.describe( 'Merchant → Cart', () => {
 				.getByRole( 'toolbar', { name: 'Block tools' } )
 				.getByRole( 'button', { name: 'Options' } );
 			await options.click();
-			const removeButton = page.getByText( 'Remove Cart' );
+			const removeButton = page.getByRole( 'menuitem', {
+				name: 'Delete',
+			} );
 			await removeButton.click();
 			// Expect block to have been removed.
 			await expect(
diff --git a/plugins/woocommerce-blocks/tests/e2e/tests/customer-account/customer-account.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/customer-account/customer-account.block_theme.spec.ts
index 3a3b8135293..f4dc043d95b 100644
--- a/plugins/woocommerce-blocks/tests/e2e/tests/customer-account/customer-account.block_theme.spec.ts
+++ b/plugins/woocommerce-blocks/tests/e2e/tests/customer-account/customer-account.block_theme.spec.ts
@@ -55,7 +55,7 @@ test.describe( `${ blockData.name } Block`, () => {
 		page,
 		frontendUtils,
 	} ) => {
-		await admin.createNewPost();
+		await admin.createNewPost( { legacyCanvas: true } );
 		await editor.insertBlock( { name: blockData.name } );
 
 		await selectTextOnlyOption( { page } );
@@ -78,7 +78,7 @@ test.describe( `${ blockData.name } Block`, () => {
 		page,
 		frontendUtils,
 	} ) => {
-		await admin.createNewPost();
+		await admin.createNewPost( { legacyCanvas: true } );
 		await editor.insertBlock( { name: blockData.name } );
 
 		await selectIconOnlyOption( { page } );
@@ -101,7 +101,7 @@ test.describe( `${ blockData.name } Block`, () => {
 		page,
 		frontendUtils,
 	} ) => {
-		await admin.createNewPost();
+		await admin.createNewPost( { legacyCanvas: true } );
 		await editor.insertBlock( { name: blockData.name } );
 
 		await selectIconAndTextOption( { page } );
diff --git a/plugins/woocommerce-blocks/tests/e2e/tests/mini-cart/mini-cart.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/mini-cart/mini-cart.block_theme.spec.ts
index df89ea3bd98..df57b7e8b27 100644
--- a/plugins/woocommerce-blocks/tests/e2e/tests/mini-cart/mini-cart.block_theme.spec.ts
+++ b/plugins/woocommerce-blocks/tests/e2e/tests/mini-cart/mini-cart.block_theme.spec.ts
@@ -23,7 +23,7 @@ const getMiniCartButton = async ( { page } ) => {
 test.describe( `${ blockData.name } Block`, () => {
 	test.describe( `standalone`, () => {
 		test.beforeEach( async ( { admin, page, editor } ) => {
-			await admin.createNewPost();
+			await admin.createNewPost( { legacyCanvas: true } );
 			await editor.insertBlock( { name: blockData.name } );
 			await editor.publishPost();
 			const url = new URL( page.url() );
@@ -108,7 +108,7 @@ test.describe( `${ blockData.name } Block`, () => {
 
 	test.describe( `with All products Block`, () => {
 		test.beforeEach( async ( { admin, page, editor } ) => {
-			await admin.createNewPost();
+			await admin.createNewPost( { legacyCanvas: true } );
 			await editor.insertBlock( { name: blockData.name } );
 			await editor.insertBlock( { name: 'woocommerce/all-products' } );
 			await editor.publishPost();
diff --git a/plugins/woocommerce-blocks/tests/e2e/tests/price-filter/price-filter.block_theme.side_effects.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/price-filter/price-filter.block_theme.side_effects.spec.ts
index 58e407c304a..ba175c745fc 100644
--- a/plugins/woocommerce-blocks/tests/e2e/tests/price-filter/price-filter.block_theme.side_effects.spec.ts
+++ b/plugins/woocommerce-blocks/tests/e2e/tests/price-filter/price-filter.block_theme.side_effects.spec.ts
@@ -28,7 +28,7 @@ const blockData: BlockData< {
 
 test.describe( `${ blockData.name } Block - with All products Block`, () => {
 	test.beforeEach( async ( { admin, page, editor } ) => {
-		await admin.createNewPost();
+		await admin.createNewPost( { legacyCanvas: true } );
 		await editor.insertBlock( { name: 'woocommerce/all-products' } );
 		await editor.insertBlock( {
 			name: 'woocommerce/filter-wrapper',
diff --git a/plugins/woocommerce-blocks/tests/e2e/tests/product-collection/product-collection.page.ts b/plugins/woocommerce-blocks/tests/e2e/tests/product-collection/product-collection.page.ts
index e2ea2763acf..d678965e61e 100644
--- a/plugins/woocommerce-blocks/tests/e2e/tests/product-collection/product-collection.page.ts
+++ b/plugins/woocommerce-blocks/tests/e2e/tests/product-collection/product-collection.page.ts
@@ -62,7 +62,7 @@ class ProductCollectionPage {
 	}
 
 	async createNewPostAndInsertBlock() {
-		await this.admin.createNewPost();
+		await this.admin.createNewPost( { legacyCanvas: true } );
 		await this.editor.insertBlock( {
 			name: this.BLOCK_NAME,
 		} );
diff --git a/plugins/woocommerce-blocks/tests/e2e/tests/products/products.block_theme.side_effects.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/products/products.block_theme.side_effects.spec.ts
index a05ff3d2287..77fa1bca139 100644
--- a/plugins/woocommerce-blocks/tests/e2e/tests/products/products.block_theme.side_effects.spec.ts
+++ b/plugins/woocommerce-blocks/tests/e2e/tests/products/products.block_theme.side_effects.spec.ts
@@ -159,15 +159,6 @@ for ( const {
 				),
 			] );
 
-			// @todo This is a workaround to wait for the save button to be enabled. It works only without Gutenberg enabled. We have to refactor this.
-			await page
-				.locator(
-					"button.edit-site-save-button__button[aria-label='Save'][aria-disabled='true']"
-				)
-				.waitFor( {
-					state: 'visible',
-				} );
-
 			await page.goto( frontendPage, {
 				waitUntil: 'load',
 			} );
diff --git a/plugins/woocommerce-blocks/tests/e2e/tests/templates/cart-template.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/templates/cart-template.block_theme.spec.ts
index 5725c94781f..e59fc95f817 100644
--- a/plugins/woocommerce-blocks/tests/e2e/tests/templates/cart-template.block_theme.spec.ts
+++ b/plugins/woocommerce-blocks/tests/e2e/tests/templates/cart-template.block_theme.spec.ts
@@ -14,17 +14,19 @@ test.describe( 'Test the cart template', async () => {
 	} );
 
 	test( 'Template can be opened in the site editor', async ( {
+		admin,
 		page,
 		editorUtils,
 	} ) => {
-		await page.goto( '/wp-admin/site-editor.php' );
+		await admin.visitAdminPage( 'site-editor.php' );
+		await editorUtils.waitForSiteEditorFinishLoading();
 		await page.getByRole( 'button', { name: /Templates/i } ).click();
 		await page.getByRole( 'button', { name: /Cart/i } ).click();
 		await editorUtils.enterEditMode();
 
 		await expect(
 			page
-				.frameLocator( 'iframe' )
+				.frameLocator( 'iframe[title="Editor canvas"i]' )
 				.locator( 'button:has-text("Proceed to checkout")' )
 				.first()
 		).toBeVisible();
@@ -45,13 +47,16 @@ test.describe( 'Test the cart template', async () => {
 			name: 'core/paragraph',
 			attributes: { content: 'Hello World' },
 		} );
-		await editor.saveSiteEditorEntities();
 
-		// Wait for the response after saving the post because sometimes there's a race condition, and loading the post
-		// shows a version without the newly saved content.
-		await editor.page.waitForResponse( ( response ) =>
-			response.url().includes( permalink )
-		);
+		await Promise.all( [
+			editor.saveSiteEditorEntities(),
+			// Wait for the response after saving the post because sometimes there's a race condition, and loading the post
+			// shows a version without the newly saved content.
+			editor.page.waitForResponse( ( response ) =>
+				response.url().includes( permalink )
+			),
+		] );
+
 		await page.goto( permalink, { waitUntil: 'commit' } );
 
 		await expect( page.getByText( 'Hello World' ).first() ).toBeVisible();
diff --git a/plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-header-template-part.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-header-template-part.block_theme.spec.ts
index 6e4db8a7ac5..2a14e6044d5 100644
--- a/plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-header-template-part.block_theme.spec.ts
+++ b/plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-header-template-part.block_theme.spec.ts
@@ -14,11 +14,15 @@ test.afterAll( async ( { requestUtils } ) => {
 
 test.describe( 'Test the checkout header template part', async () => {
 	test( 'Template can be opened in the site editor', async ( { page } ) => {
-		await page.goto( '/wp-admin/site-editor.php' );
-		await page.getByRole( 'button', { name: /Template Parts/i } ).click();
-		await page.getByRole( 'button', { name: /Checkout Header/i } ).click();
+		await page.goto(
+			'/wp-admin/site-editor.php?path=/wp_template_part/all'
+		);
+		await page.getByText( 'Checkout Header', { exact: true } ).click();
 
-		const editButton = page.getByRole( 'button', { name: /Edit/i } );
+		const editButton = page.getByRole( 'button', {
+			name: 'Edit',
+			exact: true,
+		} );
 		await expect( editButton ).toBeVisible();
 	} );
 
diff --git a/plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-template.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-template.block_theme.spec.ts
index 5d6b68c01e5..915ee11248d 100644
--- a/plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-template.block_theme.spec.ts
+++ b/plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-template.block_theme.spec.ts
@@ -14,10 +14,12 @@ test.describe( 'Test the checkout template', async () => {
 	} );
 
 	test( 'Template can be opened in the site editor', async ( {
+		admin,
 		page,
 		editorUtils,
 	} ) => {
-		await page.goto( '/wp-admin/site-editor.php' );
+		await admin.visitAdminPage( 'site-editor.php' );
+		await editorUtils.waitForSiteEditorFinishLoading();
 		await page.getByRole( 'button', { name: /Templates/i } ).click();
 		await page.getByRole( 'button', { name: /Checkout/i } ).click();
 		await editorUtils.enterEditMode();
diff --git a/plugins/woocommerce-blocks/tests/e2e/utils/editor/editor-utils.page.ts b/plugins/woocommerce-blocks/tests/e2e/utils/editor/editor-utils.page.ts
index 8fb15f0c5f0..dc0c970dab2 100644
--- a/plugins/woocommerce-blocks/tests/e2e/utils/editor/editor-utils.page.ts
+++ b/plugins/woocommerce-blocks/tests/e2e/utils/editor/editor-utils.page.ts
@@ -123,11 +123,12 @@ export class EditorUtils {
 	}
 
 	async enterEditMode() {
-		await this.editor.page.waitForSelector(
-			'.edit-site-visual-editor__editor-canvas[role="button"]',
-			{ timeout: 3000 }
-		);
-		await this.editor.canvas.click( 'body' );
+		await this.editor.page
+			.getByRole( 'button', {
+				name: 'Edit',
+				exact: true,
+			} )
+			.click();
 	}
 
 	async isBlockEarlierThan< T >(
@@ -173,4 +174,15 @@ export class EditorUtils {
 
 		return firstBlockIndex < secondBlockIndex;
 	}
+
+	async waitForSiteEditorFinishLoading() {
+		await this.page
+			.frameLocator( 'iframe[title="Editor canvas"i]' )
+			.locator( 'body > *' )
+			.first()
+			.waitFor();
+		await this.page
+			.locator( '.edit-site-canvas-spinner' )
+			.waitFor( { state: 'hidden' } );
+	}
 }