diff --git a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_references_steps.rb b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_references_steps.rb
index 5d0b31bed7..79f3a88a48 100644
--- a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_references_steps.rb
+++ b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_references_steps.rb
@@ -12,7 +12,10 @@ When(/^I click Edit for VisualEditor$/) do
 end
 
 When(/^I click Reference$/) do
-  on(VisualEditorPage).ve_references_element.when_present.click
+  on(VisualEditorPage) do |page|
+    page.more_menu_element.when_present.click
+    page.ve_references_element.when_present.click
+  end
 end
 
 When(/^I enter (.+) into Content box$/) do |content|
@@ -24,6 +27,6 @@ Then(/^I should see Insert reference button enabled$/) do
   on(VisualEditorPage).insert_reference_element.should be_visible
 end
 
-Then(/^link to references dialog should be visible$/) do
-  on(VisualEditorPage).refs_link_element.should be_visible
-end
+Then(/^link to More menu should be visible$/) do
+  on(VisualEditorPage).more_menu_element.should be_visible
+end
\ No newline at end of file
diff --git a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_transclusion_steps.rb b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_transclusion_steps.rb
index 1a1d9527b4..df2dad97cb 100644
--- a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_transclusion_steps.rb
+++ b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_transclusion_steps.rb
@@ -15,7 +15,10 @@ When(/^I click Remove template$/) do
 end
 
 When(/^I click Transclusion$/) do
-  on(VisualEditorPage).transclusion_element.when_present.click
+  on(VisualEditorPage) do |page|
+    page.more_menu_element.when_present.click
+    page.transclusion_element.when_present.click
+  end
 end
 
 When(/^I enter (.+) in the parameter box$/) do |param_value|
diff --git a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
index c4b91e1d29..cd8ee227c3 100644
--- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
@@ -8,7 +8,7 @@ class VisualEditorPage
   div(:content, class: 've-ce-documentNode ve-ce-branchNode')
   text_area(:describe_change, id: 've-init-mw-viewPageTarget-saveDialog-editSummary')
   div(:diff_view, class: 've-init-mw-viewPageTarget-saveDialog-viewer')
-  div(:downarrow, class: 've-ui-dropdownTool-icon ve-ui-icon-down')
+  span(:downarrow, class: 've-ui-iconedElement-icon ve-ui-icon-down')
   span(:heading, text: 'Heading')
   a(:edit_ve, title: 'Edit this page with VisualEditor [alt-shift-v]')
   div(:heading_diff_view, class: 've-init-mw-viewPageTarget-saveDialog-viewer')
@@ -19,13 +19,14 @@ class VisualEditorPage
   span(:linksuggestion, text: 'http://www.example.com')
   span(:looks_good, class: 've-ui-labeledElement-label', text: 'Looks good to me')
   checkbox(:minor_edit, id: 'wpMinoredit')
+  span(:more_menu, text: 'More')
   span(:newpage_linksuggestion, text: 'DoesNotExist')
   div(:page_text, id: 'mw-content-text')
   span(:page_title, text: 'Page title')
   div(:paragraph_diff_view, class: 've-init-mw-viewPageTarget-saveDialog-viewer')
   span(:paragraph, text: 'Paragraph')
   span(:preformatted, text: 'Preformatted')
-  a(:refs_link, title: 'Reference')
+  span(:refs_link, text: 'Reference')
   span(:return_to_save, class: 've-ui-labeledElement-label', text: 'Return to save form')
   span(:review_changes, class: 've-ui-labeledElement-label', text: 'Review your changes')
   div(:save_disabled, class: 've-ui-widget ve-ui-widget-disabled ve-ui-flaggableElement-constructive ve-ui-buttonWidget')
@@ -38,10 +39,10 @@ class VisualEditorPage
   div(:uparrow, class:'ve-init-mw-viewPageTarget-saveDialog-closeButton')
   div(:ve_heading_menu, class: 've-ui-dropdownTool-icon ve-ui-icon-down')
   span(:ve_heading_ui, text: 'Paragraph')
-  span(:ve_link_icon, class: 've-ui-buttonTool-icon ve-ui-icon-link')
-  span(:ve_references, class: 've-ui-buttonTool-icon ve-ui-icon-reference')
+  span(:ve_link_icon, class: 've-ui-iconedElement-icon ve-ui-icon-link')
+  span(:ve_references, text: 'Reference')
   div(:visual_editor_toolbar, class: 've-ui-toolbar-tools')
-  span(:transclusion, class: 've-ui-buttonTool-icon ve-ui-icon-template')
+  span(:transclusion, text: 'Transclusion')
 
   in_frame(:index => 0) do |frame|
     span(:add_parameter, class: 've-ui-mwParameterResultWidget-name', frame: frame)
diff --git a/modules/ve-mw/test/browser/features/visual_editor_headings.feature b/modules/ve-mw/test/browser/features/visual_editor_headings.feature
index 48c1caad91..1d4c41c0a1 100644
--- a/modules/ve-mw/test/browser/features/visual_editor_headings.feature
+++ b/modules/ve-mw/test/browser/features/visual_editor_headings.feature
@@ -71,40 +71,4 @@ Feature: VisualEditor Headings
     And I click Save page
     And I click Review your changes
     Then a Page title should appear in the diff view
-    And I should be able to click the up arrow on the save box
-
-  Scenario: Choose Subheading1 Heading
-    When I click Sub-Heading1
-      And I click Save page
-      And I click Review your changes
-    Then a sub-heading1 should appear in the diff view
-
-  Scenario: Choose Sub-Heading2 Heading
-    When I click Sub-Heading2
-      And I click Save page
-      And I click Review your changes
-    Then a sub-heading2 should appear in the diff view
-
-  Scenario: Choose Sub-Heading3 Heading
-    When I click Sub-Heading3
-      And I click Save page
-      And I click Review your changes
-    Then a sub-heading3 should appear in the diff view
-
-  Scenario: Choose Sub-Heading4 Heading
-    When I click Sub-Heading4
-      And I click Save page
-      And I click Review your changes
-    Then a sub-heading4 should appear in the diff view
-
-  Scenario: Choose Preformatted Heading
-    When I click Preformatted
-      And I click Save page
-      And I click Review your changes
-    Then a Preformatted should appear in the diff view
-
-  Scenario: Choose Page title Heading
-    When I click Page title
-      And I click Save page
-      And I click Review your changes
-    Then a Page title should appear in the diff view
+    And I should be able to click the up arrow on the save box
\ No newline at end of file
diff --git a/modules/ve-mw/test/browser/features/visual_editor_references.feature b/modules/ve-mw/test/browser/features/visual_editor_references.feature
index 200a38a71e..ad5fc74aa6 100644
--- a/modules/ve-mw/test/browser/features/visual_editor_references.feature
+++ b/modules/ve-mw/test/browser/features/visual_editor_references.feature
@@ -11,4 +11,4 @@ Feature: VisualEditor References
     Given I can see the References User Interface
     When I enter THIS IS CONTENT into Content box
       And I click Insert reference
-    Then link to references dialog should be visible
+    Then link to More menu should be visible