diff --git a/core/modules/views/lib/Drupal/views/Tests/Comment/WizardTest.php b/core/modules/views/lib/Drupal/views/Tests/Comment/WizardTest.php
index 834bd5b..2bd8aed 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Comment/WizardTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Comment/WizardTest.php
@@ -45,7 +45,7 @@ public function testCommentWizard() {
 
     // Just triggering the saving should automatically choose a proper row
     // plugin.
-    $this->drupalPost('admin/structure/views/add', $view, t('Continue & edit'));
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
     $this->assertUrl('admin/structure/views/view/' . $view['name'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
 
     // If we update the type first we should get a selection of comment valid
@@ -66,9 +66,10 @@ public function testCommentWizard() {
     }
     $expected_options = array('comment', 'fields');
     $this->assertEqual($options, $expected_options);
-    $this->drupalPost(NULL, $view, t('Continue & edit'));
+
+    $view['name'] = strtolower($this->randomName(16));
+    $this->drupalPost(NULL, $view, t('Save & edit'));
     $this->assertUrl('admin/structure/views/view/' . $view['name'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
-    $this->drupalPost(NULL, array(), t('Save'));
 
     $view = views_get_view($view['name']);
     $view->initHandlers();
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
index c2416a3..2c85e59 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
@@ -41,7 +41,7 @@ public function randomView(array $view = array()) {
 
     $view += $default;
 
-    $this->drupalPost('admin/structure/views/add', $view, t('Continue & edit'));
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
 
     return $default;
   }
@@ -88,7 +88,6 @@ public function testAddDisplay() {
 
     $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
     $this->drupalGet($path_prefix);
-    $this->drupalPost(NULL, array(), t('Save'));
 
     // Add a new display.
     $this->drupalPost(NULL, array(), 'Add Page');
@@ -108,8 +107,6 @@ public function testReorderDisplay() {
     $view = $this->randomView($view);
     $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
 
-    $edit = array();
-    $this->drupalPost($path_prefix, $edit, t('Save'));
     $this->clickLink(t('reorder displays'));
     $this->assertTrue($this->xpath('//tr[@id="display-row-default"]'), 'Make sure the default display appears on the reorder listing');
     $this->assertTrue($this->xpath('//tr[@id="display-row-page_1"]'), 'Make sure the page display appears on the reorder listing');
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
index 35ff022..4f060a8 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
@@ -32,7 +32,7 @@ function testOverrideDisplays() {
     $view['page[path]'] = $this->randomName(16);
     $view['block[create]'] = 1;
     $view_path = $view['page[path]'];
-    $this->drupalPost('admin/structure/views/add', $view, t('Save & exit'));
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
 
     // Configure its title. Since the page and block both started off with the
     // same (empty) title in the views wizard, we expect the wizard to have set
@@ -100,7 +100,7 @@ function testWizardMixedDefaultOverriddenDisplays() {
     $view['page[feed_properties][path]'] = $this->randomName(16);
     $view['block[create]'] = 1;
     $view['block[title]'] = $this->randomName(16);
-    $this->drupalPost('admin/structure/views/add', $view, t('Save & exit'));
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
 
     // Put the block into the first sidebar region, and make sure it will not
     // display on the view's page display (since we will be searching for the
@@ -186,7 +186,7 @@ function testRevertAllDisplays() {
     $view['page[path]'] = $this->randomName(16);
     $view['block[create]'] = 1;
     $view['block[title]'] = $this->randomName(16);
-    $this->drupalPost('admin/structure/views/add', $view, t('Continue & edit'));
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
 
     // Revert the title of the block back to the default ones, but submit some
     // new values to be sure that the new value is not stored.
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php
index 7c92361..98db016 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php
@@ -50,9 +50,7 @@ function testEditUI() {
     $view['page[create]'] = TRUE;
     $view['page[title]'] = $this->randomName(16);
     $view['page[path]'] = $this->randomName(16);
-    $this->drupalPost('admin/structure/views/add', $view, t('Continue & edit'));
-
-    $this->assertLink(t('Master') . '*');
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
 
     // Configure to not always show the master display.
     // If you have a view without a page or block the master display should be
@@ -63,13 +61,12 @@ function testEditUI() {
     $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration'));
 
     $view['page[create]'] = FALSE;
-    $this->drupalPost('admin/structure/views/add', $view, t('Continue & edit'));
-
-    $this->assertLink(t('Master') . '*');
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
 
     // Create a view with an additional display, so master should be hidden.
     $view['page[create]'] = TRUE;
-    $this->drupalPost('admin/structure/views/add', $view, t('Continue & edit'));
+    $view['name'] = strtolower($this->randomName());
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
 
     $this->assertNoLink(t('Master'));
 
@@ -81,7 +78,9 @@ function testEditUI() {
       'ui_show_display_embed' => TRUE,
     );
     $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration'));
-    $this->drupalPost('admin/structure/views/add', $view, t('Continue & edit'));
+
+    $view['name'] = strtolower($this->randomName());
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
     $this->assertFieldById('edit-displays-top-add-display-embed');
 
     $edit = array(
@@ -89,7 +88,7 @@ function testEditUI() {
     );
     $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration'));
     views_invalidate_cache();
-    $this->drupalPost('admin/structure/views/add', $view, t('Continue & edit'));
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
     $this->assertNoFieldById('edit-displays-top-add-display-embed');
 
     // Configure to hide/show the sql at the preview.
@@ -97,7 +96,9 @@ function testEditUI() {
       'ui_show_sql_query_enabled' => FALSE,
     );
     $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration'));
-    $this->drupalPost('admin/structure/views/add', $view, t('Continue & edit'));
+
+    $view['name'] = strtolower($this->randomName());
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
 
     $this->drupalPost(NULL, array(), t('Update preview'));
     $xpath = $this->xpath('//div[@class="views-query-info"]/pre');
@@ -107,7 +108,9 @@ function testEditUI() {
       'ui_show_sql_query_enabled' => TRUE,
     );
     $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration'));
-    $this->drupalPost('admin/structure/views/add', $view, t('Continue & edit'));
+
+    $view['name'] = strtolower($this->randomName());
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
 
     $this->drupalPost(NULL, array(), t('Update preview'));
     $xpath = $this->xpath('//div[@class="views-query-info"]//pre');