diff --git a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 0a3bc4bbe1..f949e5831f 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -94,6 +94,9 @@ class VisualEditorPage
   span(:ref_list_insert_menu, class: "oo-ui-tool-name-referencesList")
   span(:formula_insert_menu,class: "oo-ui-tool-name-math")
   div(:language_notification, class: "tipsy-inner")
+  span(:review_changes, class: "oo-ui-labelElement-label", text: "Review your changes")
+  span(:return_to_save, class: "oo-ui-labelElement-label", text: "Return to save form")
+  span(:second_save_page, css: ".oo-ui-flaggedElement-primary > a:nth-child(1) > span:nth-child(2)")
 
   in_iframe(index: 0) do |frame|
     a(:beta_warning, title: "Close", frame: frame)
@@ -138,9 +141,9 @@ class VisualEditorPage
     span(:confirm_switch_cancel_on_switch, text: "Cancel", frame: frame)
     span(:confirm_switch_discard, text: "Discard changes", frame: frame)
     div(:content_box, class: "ve-ce-documentNode ve-ce-branchNode", frame: frame)
-    text_area(:describe_change, index: 0, frame: frame)
-    div(:diff_view, class: "ve-ui-mwSaveDialog-viewer", frame: frame)
-    span(:ex, text: "Return to save form", frame: frame)
+    text_area(:describe_change, index: 0)
+    div(:diff_view, class: "ve-ui-mwSaveDialog-viewer")
+    span(:ex, text: "Return to save form")
     span(:insert_references_list, text: "Insert", frame: frame)
     span(:media_apply_changes, text: "Insert", frame: frame)
     text_field(:media_search, css: "div.oo-ui-textInputWidget > input", frame: frame)
@@ -150,10 +153,7 @@ class VisualEditorPage
     div(:parameter_icon, text: "q", frame: frame)
     a(:remove_parameter, css: ".ve-ui-mwParameterPage-removeButton > a:nth-child(1)", frame: frame)
     a(:remove_template, title: "Remove template", frame: frame)
-    span(:return_to_save, class: "oo-ui-labelElement-label", text: "Return to save form", frame: frame)
-    span(:review_changes, class: "oo-ui-labelElement-label", text: "Review your changes", frame: frame)
     div(:review_failed, class: "oo-ui-window-head", frame: frame)
-    span(:second_save_page, class: "oo-ui-labelElement-label", text: "Save page", frame: frame)
     div(:template_header, class: "ve-ui-mwTransclusionDialog-single", frame: frame)
     li(:template_list_item, text: "S", frame: frame)
     div(:title, class: "oo-ui-processDialog-location", frame: frame)