diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index e9a2359b7..23682803c 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -51,7 +51,7 @@ jobs:
     # Defines the WordPress and PHP Versions matrix to run tests on.
     strategy:
       matrix:
-        wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ]
+        wp-versions: [ '7.1-beta2' ] #[ '6.1.1', 'latest' ]
         php-versions: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.3', '7.4', '8.0', '8.1' ]
 
     # Steps to install, configure and run tests
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1e6581ad2..708717bc1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        wp-version: [ 'latest' ]
+        wp-version: [ '7.1-beta2' ]
         php-version: [ '8.1', '8.2', '8.3', '8.4' ]
         test-group:
           - 'EndToEnd/broadcasts/blocks-shortcodes'
diff --git a/tests/Support/Helper/WPGutenberg.php b/tests/Support/Helper/WPGutenberg.php
index f1d122f65..4f4b789c9 100644
--- a/tests/Support/Helper/WPGutenberg.php
+++ b/tests/Support/Helper/WPGutenberg.php
@@ -33,9 +33,15 @@ public function isGutenbergIFrameEditorEnabled()
 	 */
 	public function switchToGutenbergIFrameEditor($I)
 	{
-		// Don't switch if the iframe doesn't exist e.g. Divi is active, which prevents
-		// the iframe block editor in WordPress 7.0+ from being used.
-		if ( ! $I->tryToSeeElement('iframe[name="editor-canvas"]')) {
+		// Wait for the iframe to mount. In WordPress 7.1+ the editor iframe
+		// can take longer to appear in the DOM than a tryToSeeElement()
+		// check, causing the switch to be silently skipped. Catch the timeout
+		// so that environments which intentionally have no iframe (e.g. Divi
+		// is active, which prevents the iframe block editor from being used)
+		// still fall through to the non-iframe path.
+		try {
+			$I->waitForElement('iframe[name="editor-canvas"]', 10);
+		} catch (\Facebook\WebDriver\Exception\TimeoutException $e) {
 			return;
 		}