diff --git a/core/modules/dblog/src/Tests/Update/DblogFiltersAndFieldsUpgradeTest.php b/core/modules/dblog/src/Tests/Update/DblogFiltersAndFieldsUpgradeTest.php
index ab5f7de..4a8ddef 100644
--- a/core/modules/dblog/src/Tests/Update/DblogFiltersAndFieldsUpgradeTest.php
+++ b/core/modules/dblog/src/Tests/Update/DblogFiltersAndFieldsUpgradeTest.php
@@ -12,7 +12,7 @@
  *
  * @group Update
  */
-class DblogUpgrade2851293 extends UpdatePathTestBase {
+class DblogFiltersAndFieldsUpgradeTest extends UpdatePathTestBase {
 
   /**
    * {@inheritdoc}
@@ -40,7 +40,7 @@ public function testDblogUpgradePath() {
     $this->assertEqual('standard', $fields['uid']['plugin_id']);
 
     $filters = $data['display']['default']['display_options']['filters'];
-    // type should use the dblog_types plugin now.
+    // Type should use the dblog_types plugin now.
     $this->assertEqual('dblog_types', $filters['type']['plugin_id']);
   }
 
diff --git a/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php b/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
index 78a0e6a..970ff2f 100644
--- a/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
+++ b/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
@@ -38,9 +38,6 @@ class ViewsIntegrationTest extends ViewsKernelTestBase {
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
 
-    // Rebuild the router, otherwise we can't generate links.
-    $this->container->get('router.builder')->rebuild();
-
     $this->installEntitySchema('user');
     $this->installSchema('dblog', ['watchdog']);
 
@@ -55,7 +52,7 @@ public function testMessages() {
     // Remove the watchdog entries added by the potential batch process.
     $this->container->get('database')->truncate('watchdog')->execute();
 
-    $entries = $this->createRandomLogEntries();
+    $entries = $this->createLogEntries();
 
     $view = Views::getView('test_dblog');
     $this->executeView($view);
@@ -107,7 +104,7 @@ public function testRelationship() {
   public function testFiltering() {
     // Remove the watchdog entries added by the potential batch process.
     $this->container->get('database')->truncate('watchdog')->execute();
-    $this->createRandomLogEntries();
+    $this->createLogEntries();
 
     $view = Views::getView('dblog_integration_test');
 
@@ -171,7 +168,12 @@ public function testFiltering() {
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  protected function createRandomLogEntries() {
+  /**
+   * Create a set of log entries.
+   * @return array
+   *   An array of data used to create the log entries.
+   */
+  protected function createLogEntries() {
     $entries = [];
     // Setup a watchdog entry without tokens.
     $entries[] = [