diff --git a/tests/behat/features/duplicate-a-page.feature b/tests/behat/features/duplicate-a-page.feature
index 96a3a5dc..a4a01fba 100644
--- a/tests/behat/features/duplicate-a-page.feature
+++ b/tests/behat/features/duplicate-a-page.feature
@@ -20,5 +20,6 @@ Feature: Duplicate a page
 
 		When I fill in "Title" with "Duplicate Page"
 		And I press the "Save & publish" button
+		And I wait for 1 second
 		Then I should see "Page1" in the tree
 		And I should see "Duplicate Page" in the tree
diff --git a/tests/behat/features/edit-a-page.feature b/tests/behat/features/edit-a-page.feature
index b7b52881..7b50624d 100644
--- a/tests/behat/features/edit-a-page.feature
+++ b/tests/behat/features/edit-a-page.feature
@@ -22,7 +22,7 @@ Feature: Edit a page
     When I fill in "Title" with "About Us!"
     And I fill in the "Content" HTML field with "<p>my new content</p>"
     And I press the "Save draft" button
-    Then I should see "Saved" in the "button#Form_EditForm_action_save" element
+    Then I should see the "Saved" button
 
     When I click on "About Us" in the tree
     Then the "Title" field should contain "About Us!"
diff --git a/tests/behat/features/insert-an-image.feature b/tests/behat/features/insert-an-image.feature
index 7f552bf9..2703a85d 100644
--- a/tests/behat/features/insert-an-image.feature
+++ b/tests/behat/features/insert-an-image.feature
@@ -65,7 +65,7 @@ Feature: Insert an image into a page
     Given I press the "Insert Media" HTML field button
     And I fill in the "ParentID" dropdown with "folder1"
     And I click on "file1" in the "Files" table
-    And I press the "Edit" button
+    And I press the "Edit this file" button
     When I fill in "Alternative text (alt)" with "My alt"
     And I press the "Insert" button
     Then the "Content" HTML field should contain "file1__Resampled.jpg"
diff --git a/tests/behat/features/publish-a-page.feature b/tests/behat/features/publish-a-page.feature
index 9dafbbf9..c2bc8f06 100644
--- a/tests/behat/features/publish-a-page.feature
+++ b/tests/behat/features/publish-a-page.feature
@@ -18,7 +18,7 @@ Feature: Publish a page
     And I go to "/admin/pages"
     And I should see "My Page" in the tree
     And I click on "My Page" in the tree
-    And I press the "Publish" button
+    And I press the "Save & publish" button
 
     Then I press the "Log out" button
     And I go to "/my-page"
@@ -33,22 +33,22 @@ Feature: Publish a page
     And I click on "My Page" in the tree
 
     When I click "More options" in the "#ActionMenus" element
-    Then I should not see "Unpublish" in the "#ActionMenus_MoreOptions" element
-    And I should see "Not published" in the "#ActionMenus_MoreOptions" element
-    And I should see "Archive" in the "#ActionMenus_MoreOptions" element
+    Then I should see "Not published" in the "#ActionMenus_MoreOptions" element
+    And I should not see an "Unpublish" button
+    And I should see an "Archive" button
     And I should see a "Save & publish" button
     And I should see a "Saved" button
 
     When I fill in the "Content" HTML field with "<p>my new content</p>"
     And I click "More options" in the "#ActionMenus" element
-    Then I should not see "Unpublish" in the "#ActionMenus_MoreOptions" element
+    Then I should not see an "Unpublish" button
     And I should see a "Save & publish" button
     And I should see a "Save draft" button
 
-    When I press the "Publish" button
+    When I press the "Save & publish" button
     And I click "More options" in the "#ActionMenus" element
-    Then I should see "Unpublish" in the "#ActionMenus_MoreOptions" element
-    And I should see "Archive" in the "#ActionMenus_MoreOptions" element
+    Then I should see an "Unpublish" button
+    And I should see an "Unpublish and archive" button
     And I should see a "Published" button
     And I should see a "Saved" button
 
@@ -76,13 +76,13 @@ Feature: Publish a page
     And I go to "/admin/pages"
     And I should see "My Page" in the tree
     And I click on "My Page" in the tree
-    And I press the "Publish" button
+    And I press the "Save & publish" button
     And I click "More options" in the "#ActionMenus" element
-    Then I should see "Unpublish" in the "#ActionMenus_MoreOptions" element
+    Then I should see an "Unpublish" button
 
     When I press the "Unpublish" button, confirming the dialog
     And I click "More options" in the "#ActionMenus" element
-    Then I should see "Archive" in the "#ActionMenus_MoreOptions" element
+    Then I should see an "Archive" button
 
     When I press the "Archive" button, confirming the dialog
     Then I should see a "Restore" button