diff --git a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
index 9388ec8..358161c 100644
--- a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
+++ b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
@@ -51,9 +51,6 @@ protected function setUp() {
    * Tests opening Offcanvas tray by click blocks and elements in the blocks.
    */
   public function testBlocks() {
-    // @todo: re-enable once https://www.drupal.org/node/2830485 is resolved.
-    $this->markTestSkipped('Test skipped due to random failures in DrupalCI, see https://www.drupal.org/node/2830485');
-
     $web_assert = $this->assertSession();
     $blocks = [
       [
@@ -80,6 +77,10 @@ public function testBlocks() {
     foreach ($blocks as $block) {
       $block_selector = '#' . $block['id'];
       $this->drupalGet('user');
+      // After the page loaded we need to additionally wait until the settings
+      // tray Ajax activity is done.
+      $web_assert->assertWaitOnAjaxRequest();
+
       if (isset($block['toolbar_item'])) {
         // Check that you can open a toolbar tray and it will be closed after
         // entering edit mode.