diff --git a/functional-tests/tests/highlight_comment.js b/functional-tests/tests/highlight_comment.js
index dd4c04e56..7edddf288 100644
--- a/functional-tests/tests/highlight_comment.js
+++ b/functional-tests/tests/highlight_comment.js
@@ -70,8 +70,6 @@ Scenario('Create/Reply/Delete a new highlight comment annotation @desktop', func
     /*
      * Delete the highlight comment annotation and reply
      */
-    I.waitForVisible(SELECTOR_ANNOTATIONS_LOADED);
-
     I.say('Highlight dialog should appear on click');
     I.click(`${SELECTOR_TEXT_LAYER} div`);
     I.waitForVisible(SELECTOR_ANNOTATION_DIALOG);
diff --git a/functional-tests/tests/plain_highlight.js b/functional-tests/tests/plain_highlight.js
index 756ad3b4e..d0c12fcf3 100644
--- a/functional-tests/tests/plain_highlight.js
+++ b/functional-tests/tests/plain_highlight.js
@@ -46,8 +46,8 @@ Scenario('Create/Delete a new plain highlight annotation @desktop', function(I)
     I.waitForVisible(SELECTOR_ANNOTATION_HIGHLIGHT_DIALOG);
 
     I.say('Delete the highlight annotation');
-    I.click(SELECTOR_ADD_HIGHLIGHT_BTN);
+    I.click(`${SELECTOR_ADD_HIGHLIGHT_BTN}${SELECTOR_ACTIVE}`);
 
     I.say('Highlight should be deleted');
-    I.waitForDetached(SELECTOR_ANNOTATION_DIALOG, 5);
+    I.waitForDetached(SELECTOR_ANNOTATION_DIALOG, 1);
 });