diff --git a/.github/workflows/all-e2e-tests.yml b/.github/workflows/all-e2e-tests.yml
index 26976577..a82c29ce 100644
--- a/.github/workflows/all-e2e-tests.yml
+++ b/.github/workflows/all-e2e-tests.yml
@@ -22,7 +22,7 @@ concurrency:
 env:
   APPLY_RESOURCE_LIMITS: "auto"
   # Newest first: a failure on the newest line is the one to see first in the run UI.
-  ELK_VERSIONS: "9.5.3 9.4.6 8.19.21 7.17.29"
+  ELK_VERSIONS: "9.5.4 9.4.7 8.19.21 7.17.29"
   ECK_3X: eck-3.5.0
   ECK_2X: eck-2.16.1
 
diff --git a/e2e-tests/cypress/support/page-objects/RoAndRoStrictKibanaAccessAssertions.ts b/e2e-tests/cypress/support/page-objects/RoAndRoStrictKibanaAccessAssertions.ts
index 76b9070a..9afcf187 100644
--- a/e2e-tests/cypress/support/page-objects/RoAndRoStrictKibanaAccessAssertions.ts
+++ b/e2e-tests/cypress/support/page-objects/RoAndRoStrictKibanaAccessAssertions.ts
@@ -140,11 +140,15 @@ export class RoAndRoStrictKibanaAccessAssertions {
   }
 
   private static changeTenancyAndAwaitSpaces(tenancyName: string) {
-    if (semver.gte(getKibanaVersion(), '9.4.0')) {
+    const shouldAwaitSpacesPlugin = semver.gte(getKibanaVersion(), '9.4.0') && semver.lte(getKibanaVersion(), '9.5.3');
+
+    if (shouldAwaitSpacesPlugin) {
       cy.intercept('*/bundles/plugin/spaces/1.0.0/spaces.chunk*').as('spacesPlugin');
     }
+
     RorMenu.changeTenancy(tenancyName);
-    if (semver.gte(getKibanaVersion(), '9.4.0')) {
+
+    if (shouldAwaitSpacesPlugin) {
       cy.wait('@spacesPlugin');
     }
   }