diff --git a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
index 32c7961..4dea86c 100644
--- a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
+++ b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
@@ -60,7 +60,7 @@ public function testBlocks() {
       [
         'id' => 'block-branding',
         'new_page_text' => 'The site that will live a very short life.',
-        'element_selector' => 'a[rel="home"]',
+        'element_selector' => 'a[rel="home"]:nth-child(2)',
       ],
       [
         'id' => 'block-search',
@@ -91,7 +91,7 @@ public function testBlocks() {
         // @todo Use standard pressButton() after GastonJS problem solved.
         // https://www.drupal.org/node/2789381
         // $this->getTray()->pressButton('Save block');
-        $this->triggerClick('.ui-dialog-buttonset .js-form-submit');
+        $this->click('.ui-dialog-buttonset .js-form-submit');
         // Make sure the changes are present.
         $this->getSession()->wait(500);
         $web_assert = $this->assertSession();
@@ -151,22 +151,9 @@ protected function assertOffCanvasBlockFormIsValid() {
    *   A css selector selects the block or an element within it.
    */
   protected function openBlockForm($block_selector) {
-    $this->triggerClick($block_selector);
+    $this->click($block_selector);
     $this->waitForOffCanvasToOpen();
     $this->assertOffCanvasBlockFormIsValid();
   }
 
-  /**
-   * Trigger click on an element via Javascript.
-   *
-   * @todo Remove when Javascript testing bug is fixed. https://www.drupal.org/node/2773791
-   *
-   * @param string $css_selector
-   *   The CSS selector for the element to click.
-   */
-  protected function triggerClick($css_selector) {
-    $this->waitForElement($css_selector, 100);
-    $this->getSession()->getDriver()->evaluateScript("jQuery('$css_selector:first').click()");
-  }
-
 }