core/drupalci.yml                                  | 41 ++--------------------
 .../LayoutBuilderQuickEditTest.php                 |  5 ++-
 2 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/core/drupalci.yml b/core/drupalci.yml
index 2085b9737b..5e5ccaf832 100644
--- a/core/drupalci.yml
+++ b/core/drupalci.yml
@@ -3,48 +3,11 @@
 # https://www.drupal.org/drupalorg/docs/drupal-ci/customizing-drupalci-testing
 build:
   assessment:
-    validate_codebase:
-      phplint:
-      csslint:
-        halt-on-fail: false
-      eslint:
-        # A test must pass eslinting standards check in order to continue processing.
-        halt-on-fail: false
-      phpcs:
-        # phpcs will use core's specified version of Coder.
-        sniff-all-files: false
-        halt-on-fail: false
     testing:
-      # run_tests task is executed several times in order of performance speeds.
-      # halt-on-fail can be set on the run_tests tasks in order to fail fast.
-      # suppress-deprecations is false in order to be alerted to usages of
-      # deprecated code.
-      run_tests.phpunit:
-        types: 'PHPUnit-Unit'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.kernel:
-        types: 'PHPUnit-Kernel'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.simpletest:
-         types: 'Simpletest'
-         testgroups: '--all'
-         suppress-deprecations: false
-         halt-on-fail: false
-      run_tests.functional:
-        types: 'PHPUnit-Functional'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
       run_tests.javascript:
         concurrency: 15
         types: 'PHPUnit-FunctionalJavascript'
-        testgroups: '--all'
+        testgroups: '--class "Drupal\Tests\layout_builder\FunctionalJavascript\LayoutBuilderQuickEditTest"'
         suppress-deprecations: false
         halt-on-fail: false
-      # Run nightwatch testing.
-      # @see https://www.drupal.org/project/drupal/issues/2869825
-      nightwatchjs:
+        repeat: 50
diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php
index dc5c24e7e2..80de4eb5f5 100644
--- a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php
+++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php
@@ -100,9 +100,7 @@ public function testLayoutBuilderRenderPipelineForQuickEdit() {
 
     // Start in-place editing of the article node.
     $this->clickContextualLink('[data-quickedit-entity-id="node/1"]', 'Quick edit');
-    $this->assertEntityInstanceStates([
-      'node/1[0]' => 'opened',
-    ]);
+    $this->assertJsCondition("Drupal.quickedit.collections.entities.get('node/1[0]').get('state') === 'opened'");
     $this->assertQuickEditEntityToolbar((string) $this->article->label(), NULL);
     $this->assertEntityInstanceFieldStates('node', 1, 0, [
       'node/1/title/en/full'      => 'candidate',
@@ -115,6 +113,7 @@ public function testLayoutBuilderRenderPipelineForQuickEdit() {
 
     // Click the body field.
     $this->click('[data-quickedit-entity-id="node/1"] .field--name-body');
+    $this->awaitEntityInstanceFieldState('node', 1, 0, 'body', 'en', 'active');
     $assert_session->waitForElement('css', '.quickedit-toolbar-field div[id*="body"]');
     $this->assertQuickEditEntityToolbar((string) $this->article->label(), 'Body');
     $this->assertEntityInstanceFieldStates('node', 1, 0, [