diff --git a/.github/files/generate-ci-matrix.php b/.github/files/generate-ci-matrix.php
index 85336222ab80..0d859904c3e3 100755
--- a/.github/files/generate-ci-matrix.php
+++ b/.github/files/generate-ci-matrix.php
@@ -61,7 +61,9 @@
 		'timeout' => 20, // 2022-01-25: 5.6 tests have started timing out at 15 minutes. Previously: Successful runs seem to take ~8 minutes for PHP 5.6 and for the 7.4 master run, ~5.5-6 for 7.x and 8.0.
 	);
 }
-// Merge this into the above once we decide PHP 8.1 is stable and WP latest works with 8.1.
+// Uncomment this once WP master finally works with 8.1. Then merge into the above once WP latest does and we've cleaned up any problems in our own code.
+// phpcs:ignore Squiz.PHP.CommentedOutCode.Found, Squiz.Commenting.BlockComment.NoEmptyLineBefore
+/*
 $matrix[] = array(
 	'name'         => 'PHP tests: PHP 8.1 WP master',
 	'script'       => 'test-php',
@@ -70,6 +72,7 @@
 	'timeout'      => 15,
 	'experimental' => true,
 );
+*/
 foreach ( array( 'previous', 'master' ) as $wp ) {
 	$matrix[] = array(
 		'name'    => "PHP tests: PHP {$versions['PHP_VERSION']} WP $wp",