diff --git a/tests/behat/features/edit-a-page.feature b/tests/behat/features/edit-a-page.feature
index cf7684f2..0c32b9d9 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 "my new content"
     And I press the "Save Draft" button
-    Then I should see a "Saved." notice
+    Then I should see a "Saved" button
 
     When I follow "About Us"
     Then the "Title" field should contain "About Us!"
diff --git a/tests/behat/features/preview-a-page.feature b/tests/behat/features/preview-a-page.feature
index 452f9418..98ec73e8 100644
--- a/tests/behat/features/preview-a-page.feature
+++ b/tests/behat/features/preview-a-page.feature
@@ -14,6 +14,7 @@ Feature: Preview a page
     And I set the CMS mode to "Preview mode"
     Then I can see the preview panel
     And the preview contains "About Us"
+    Then I set the CMS mode to "Edit mode"
 
   # TODO:
   # - Only tests correctly on fresh database