diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
index 3ab47a666e5908ddc8132a0ddbb227cb281a151b..31b33d61c9ba0112fb6f7561ee0d7931cd354df6 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
@@ -301,6 +301,7 @@ public function testUiAjaxException() {
    * Tests ajax focus handling.
    */
   public function testAjaxFocus() {
+    $this->markTestSkipped("Skipped due to frequent random test failures. See https://www.drupal.org/project/drupal/issues/3396536");
     $this->drupalGet('/ajax_forms_test_get_form');
 
     $this->assertNotNull($select = $this->assertSession()->elementExists('css', '#edit-select'));
@@ -326,6 +327,14 @@ public function testAjaxFocus() {
     $has_focus_id = $this->getSession()->evaluateScript('document.activeElement.id');
     $this->assertEquals('edit-textfield-2', $has_focus_id);
 
+    // Test textfield with 'change' event listener with refocus-blur set to
+    // FALSE.
+    $textfield2->setValue('Llamas say yarhar');
+    $textfield3->focus();
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $has_focus_id = $this->getSession()->evaluateScript('document.activeElement.id');
+    $this->assertEquals('edit-textfield-2', $has_focus_id);
+
     // Test textfield with 'change' event.
     $textfield3->focus();
     $textfield3->setValue('Wasps buzz');