diff --git a/tests/Behat/features/broken-element.feature b/tests/Behat/features/broken-element.feature
index 105dfb5e..336dbe38 100644
--- a/tests/Behat/features/broken-element.feature
+++ b/tests/Behat/features/broken-element.feature
@@ -43,6 +43,6 @@ Feature: Broken element in CMS
   Scenario: I can publish the page
     Given I see a list of blocks
     When I press the "Publish" button
-    Then I should see a "Published 'Blocks Page' successfully." success toast
+    Then I should see a "Published Page "Blocks Page"" success toast
       # This message displays if the ObsoleteClass check is not present in BaseElement::write()
       And I should not see "you need to change the ClassName before you can write it"
diff --git a/tests/Behat/features/edit-block-element.feature b/tests/Behat/features/edit-block-element.feature
index 84ab1d5f..643d11dc 100644
--- a/tests/Behat/features/edit-block-element.feature
+++ b/tests/Behat/features/edit-block-element.feature
@@ -88,7 +88,7 @@ Feature: Edit elements in the CMS
     When I press the "Save" button
     Then I should see a "Saved 'Alice's Much Improved Block' successfully" success toast
     And I should see a "Saved 'Bob's Radically Redesigned Revolutionary Element' successfully" success toast
-    And I should see a "Saved 'Blocks Page' successfully." success toast
+    And I should see a "Saved Page "Blocks Page"" success toast
     When I dismiss all toasts
       And I should see "Alice's Much Improved Block"
       And I should see "New content for block 1"
diff --git a/tests/Behat/features/multiple-wysiwyg-configs.feature b/tests/Behat/features/multiple-wysiwyg-configs.feature
index 3afb1785..a649268c 100644
--- a/tests/Behat/features/multiple-wysiwyg-configs.feature
+++ b/tests/Behat/features/multiple-wysiwyg-configs.feature
@@ -29,7 +29,7 @@ Feature: multiple elemental blocks with different HTMLEditorConfig instances
     When I click on block 2
     # In CI, the mouse position just happens to produce a tooltip that stops us clicking on the insert link button
     # so we have to move the mouse somewhere else to avoid that
-    And I click on the "input[type='text']" element
+    And I click on the ".element-editor-editform input[type='text']" element
     And I click on the "#Form_ElementForm_2 button[aria-label^='Insert link']" element
     Then I should see "Page on this site" in the ".tox-menu" element
     And I should see "Link to a file" in the ".tox-menu" element
diff --git a/tests/Behat/features/page-save-validation.feature b/tests/Behat/features/page-save-validation.feature
index 5b9c730e..fe28bfd5 100644
--- a/tests/Behat/features/page-save-validation.feature
+++ b/tests/Behat/features/page-save-validation.feature
@@ -86,6 +86,6 @@ Feature: Blocks are validated when page saving blocks
     # Now should see 2x success toast messages, one for the block, the other for the page
     Then I should see a "Saved 'Valid block one' successfully" success toast
     When I click on the ".toast__close" element
-    Then I should see a "Saved 'Blocks Page' successfully." success toast
+    Then I should see a "Saved Page "Blocks Page"" success toast
     When I click on the ".toast__close" element
     Then I should not see a ".toast__close" element