diff --git a/core/tests/Drupal/Nightwatch/Tests/oliveroDesktopMenuTest.js b/core/tests/Drupal/Nightwatch/Tests/oliveroDesktopMenuTest.js
index 0b54398e1e..0855b158d3 100644
--- a/core/tests/Drupal/Nightwatch/Tests/oliveroDesktopMenuTest.js
+++ b/core/tests/Drupal/Nightwatch/Tests/oliveroDesktopMenuTest.js
@@ -75,15 +75,22 @@ module.exports = {
       .click(`[aria-controls="${linkSubMenuId}"]`)
       .keys(browser.Keys.TAB)
       .pause(50)
-      .assert.visible(`#${linkSubMenuId}`)
+      .assert.attributeEquals(
+        `[aria-controls="${linkSubMenuId}"]`,
+        'aria-expanded',
+        'true',
+      )
       .keys(browser.Keys.SHIFT)
-      .keys(browser.Keys.TAB)
-      .pause(50) // Focus back to button.
-      .keys(browser.Keys.TAB)
-      .pause(50) // Focus back to link.
-      .keys(browser.Keys.TAB)
-      .pause(50) // Focus to site branding.
-      .pause(400)
-      .assert.not.visible(`#${linkSubMenuId}`);
+      .keys(browser.Keys.TAB) // Focus back to button.
+      .pause(50)
+      .keys(browser.Keys.TAB) // Focus back to link.
+      .pause(50)
+      .keys(browser.Keys.TAB) // Focus to site branding.
+      .pause(1000)
+      .assert.attributeEquals(
+        `[aria-controls="${linkSubMenuId}"]`,
+        'aria-expanded',
+        'false',
+      )
   },
 };