diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockCreationTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockCreationTest.php
index 5bb5e81..f62dd0d 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockCreationTest.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockCreationTest.php
@@ -145,23 +145,17 @@ public function testBlockDelete() {
     $this->drupalPost('block/add/basic', $edit2, t('Save'));
 
     $this->assertNoRaw('Error message');
-  }
 
-  /**
-   * Test deleting a block with no instances.
-   */
-  public function testBlockDeleteNoInstances() {
-    // Create a block.
-    $edit = array();
-    $langcode = Language::LANGCODE_NOT_SPECIFIED;
-    $edit['info'] = $this->randomName(8);
+    // Create another block with no instances, and test we don't get a
+    // confirmation message about deleting instances.
+    $edit3 = array();
+    $edit3['info'] = $this->randomName(8);
     $body = $this->randomName(16);
-    $edit["block_body[$langcode][0][value]"] = $body;
-    $this->drupalPost('block/add/basic', $edit, t('Save'));
-
-    // Delete the block.
-    $this->drupalGet('block/1/delete');
+    $edit3["block_body[$langcode][0][value]"] = $body;
+    $this->drupalPost('block/add/basic', $edit3, t('Save'));
 
+    // Show the delete confirm form.
+    $this->drupalGet('block/3/delete');
     $this->assertNoText('This will also remove');
   }