@@ -111,7 +111,7 @@ public function testAddEvent(): void
                 ->click()// Click to free the mouse
                 ->perform();
 
-        $this->byXPath("//button[contains(., 'Go')]")->click();
+        $this->byCssSelector('div.ui-dialog-buttonset button:nth-child(1)')->click();
 
         $this->waitForElement(
             'xpath',
@@ -174,7 +174,7 @@ public function testEditEvents(): void
         $this->byName('item_interval_value')->clear();
         $this->byName('item_interval_value')->sendKeys('2');
 
-        $this->byXPath("//button[contains(., 'Go')]")->click();
+        $this->byCssSelector('div.ui-dialog-buttonset button:nth-child(1)')->click();
 
         $this->waitForElement(
             'xpath',
@@ -207,7 +207,7 @@ public function testDropEvent(): void
         $this->waitForElement('xpath', '//div[contains(., "Event scheduler status")]');
 
         $this->byPartialLinkText('Drop')->click();
-        $this->waitForElement('className', 'submitOK')->click();
+        $this->waitForElement('id', 'functionConfirmOkButton')->click();
 
         $this->waitAjaxMessage();