diff --git a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateFilledTest.php b/core/modules/block/src/Tests/Update/BlockContextMappingUpdateFilledTest.php
new file mode 100644
index 00000000000..5b4aef109a7
--- /dev/null
+++ b/core/modules/block/src/Tests/Update/BlockContextMappingUpdateFilledTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block\Tests\Update\BlockContextMappingUpdateFilledTest.
+ */
+
+namespace Drupal\block\Tests\Update;
+
+/**
+ * Runs BlockContextMappingUpdateTest with a dump filled with content.
+ *
+ * @group Update
+ */
+class BlockContextMappingUpdateFilledTest extends BlockContextMappingUpdateTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->databaseDumpFiles[0] = __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz';
+    parent::setUp();
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexFilledTest.php b/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexFilledTest.php
new file mode 100644
index 00000000000..277762b86ad
--- /dev/null
+++ b/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexFilledTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Entity\Update\SqlContentEntityStorageSchemaIndexFilledTest.
+ */
+
+namespace Drupal\system\Tests\Entity\Update;
+
+/**
+ * Runs SqlContentEntityStorageSchemaIndexTest with a dump filled with content.
+ *
+ * @group Entity
+ */
+class SqlContentEntityStorageSchemaIndexFilledTest extends SqlContentEntityStorageSchemaIndexTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    $this->databaseDumpFiles[0] = __DIR__ . '/../../../../tests/fixtures/update/drupal-8.filled.standard.php.gz';
+    parent::setUp();
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Update/MenuTreeSerializationTitleFilledTest.php b/core/modules/system/src/Tests/Update/MenuTreeSerializationTitleFilledTest.php
new file mode 100644
index 00000000000..9f8aba717ad
--- /dev/null
+++ b/core/modules/system/src/Tests/Update/MenuTreeSerializationTitleFilledTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Update\MenuTreeSerializationTitleFilledTest.
+ */
+
+namespace Drupal\system\Tests\Update;
+
+/**
+ * Runs MenuTreeSerializationTitleTest with a dump filled with content.
+ *
+ * @group Update
+ */
+class MenuTreeSerializationTitleFilledTest extends MenuTreeSerializationTitleTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    $this->databaseDumpFiles[0] = __DIR__ . '/../../../tests/fixtures/update/drupal-8.filled.standard.php.gz';
+    parent::setUp();
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Update/RouterIndexOptimizationFilledTest.php b/core/modules/system/src/Tests/Update/RouterIndexOptimizationFilledTest.php
new file mode 100644
index 00000000000..171e225ef26
--- /dev/null
+++ b/core/modules/system/src/Tests/Update/RouterIndexOptimizationFilledTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Update\RouterIndexOptimizationFilledTest.
+ */
+
+namespace Drupal\system\Tests\Update;
+
+/**
+ * Runs RouterIndexOptimizationTest with a dump filled with content.
+ *
+ * @group Update
+ */
+class RouterIndexOptimizationFilledTest extends RouterIndexOptimizationTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    $this->databaseDumpFiles[0] = __DIR__ . '/../../../tests/fixtures/update/drupal-8.filled.standard.php.gz';
+    parent::setUp();
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
index 8aca9794c6f..6c9b23bf2ba 100644
--- a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
+++ b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
@@ -29,6 +29,10 @@ use Symfony\Component\HttpFoundation\Request;
  *   method in this class.
  * - In your test method, call $this->runUpdates() to run the necessary updates,
  *   and then use test assertions to verify that the result is what you expect.
+ * - In order to test both with a "bare" database dump as well as with a
+ *   database dump filled with content, extend your update path test class with
+ *   a new test class that overrides the bare database dump. Refer to
+ *   UpdatePathTestBaseFilledTest for an example.
  *
  * @ingroup update_api
  *
@@ -50,6 +54,10 @@ abstract class UpdatePathTestBase extends WebTestBase {
    * normally included first -- this sets up the base database from a bare
    * standard Drupal installation.
    *
+   * The file system/tests/fixtures/update/drupal-8.filled.standard.php.gz
+   * can also be used in case we want to test with a database filled with
+   * content, and with all core modules enabled.
+   *
    * @var array
    */
   protected $databaseDumpFiles = [];
diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php b/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php
new file mode 100644
index 00000000000..ca60c771d94
--- /dev/null
+++ b/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Update\UpdatePathTestBaseFilledTest.php
+ */
+
+namespace Drupal\system\Tests\Update;
+
+/**
+ * Runs UpdatePathTestBaseTest with a dump filled with content.
+ *
+ * @group Update
+ */
+class UpdatePathTestBaseFilledTest extends UpdatePathTestBaseTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->databaseDumpFiles[0] = __DIR__ . '/../../../tests/fixtures/update/drupal-8.filled.standard.php.gz';
+    parent::setUp();
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Update/UpdatePathWithBrokenRoutingFilledTest.php b/core/modules/system/src/Tests/Update/UpdatePathWithBrokenRoutingFilledTest.php
new file mode 100644
index 00000000000..04e0a00dcca
--- /dev/null
+++ b/core/modules/system/src/Tests/Update/UpdatePathWithBrokenRoutingFilledTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Update\UpdatePathWithBrokenRoutingFilledTest.
+ */
+
+namespace Drupal\system\Tests\Update;
+
+/**
+ * Runs UpdatePathWithBrokenRoutingTest with a dump filled with content.
+ *
+ * @group Update
+ */
+class UpdatePathWithBrokenRoutingFilledTest extends UpdatePathWithBrokenRoutingTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->databaseDumpFiles[0] =  '/../../../tests/fixtures/update/drupal-8.filled.standard.php.gz';
+    parent::setUp();
+  }
+
+}
diff --git a/core/modules/system/tests/fixtures/update/drupal-8.bare.standard.php.gz b/core/modules/system/tests/fixtures/update/drupal-8.bare.standard.php.gz
index 9808e994ea2..911091a05e3 100644
Binary files a/core/modules/system/tests/fixtures/update/drupal-8.bare.standard.php.gz and b/core/modules/system/tests/fixtures/update/drupal-8.bare.standard.php.gz differ
diff --git a/core/modules/system/tests/fixtures/update/drupal-8.filled.standard.php.gz b/core/modules/system/tests/fixtures/update/drupal-8.filled.standard.php.gz
new file mode 100644
index 00000000000..c408974d4bc
Binary files /dev/null and b/core/modules/system/tests/fixtures/update/drupal-8.filled.standard.php.gz differ
diff --git a/core/modules/views/src/Tests/Update/EntityViewsDataUpdateFilledTest.php b/core/modules/views/src/Tests/Update/EntityViewsDataUpdateFilledTest.php
new file mode 100644
index 00000000000..50894f368f3
--- /dev/null
+++ b/core/modules/views/src/Tests/Update/EntityViewsDataUpdateFilledTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Tests\Update\EntityViewsDataUpdateFilledTest.
+ */
+
+namespace Drupal\views\Tests\Update;
+
+/**
+ * Runs EntityViewsDataUpdateTest with a dump filled with content.
+ *
+ * @group Update
+ */
+class EntityViewsDataUpdateFilledTest extends EntityViewsDataUpdateTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->databaseDumpFiles[0] = __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz';
+    parent::setUp();
+  }
+
+}