diff --git a/core/modules/dblog/config/install/tour.tour.dblog.yml b/core/modules/dblog/config/install/tour.tour.dblog.yml
new file mode 100644
index 0000000..ba69450
--- /dev/null
+++ b/core/modules/dblog/config/install/tour.tour.dblog.yml
@@ -0,0 +1,62 @@
+id: dblog
+module: dblog
+label: 'Database log'
+langcode: en
+status: true
+routes:
+  - route_name: dblog.overview
+tips:
+  dblog-intro:
+    id: dblog-about
+    plugin: text
+    label: 'Recent log messages'
+    body: "System events such as errors, failed login attempts and content updates are stored as messages in the site's database. On the <em>Recent log messages</em> page you find a chronological list of recorded messages that you can filter and view. You should check the log messages on a regular basis to ensure the site is working properly"
+    weight: 1
+  dblog-filter:
+    id: dblog-filter
+    plugin: text
+    label: 'Filtering messages'
+    body: 'Click on <em>Filter log messages</em> to filter the log messages by <em>Type</em> (usually the name of the module that generated the message) or <em>Severity</em> (emergency, critical, notice, etc).'
+    weight: 2
+    attributes:
+      data-class: 'dblog-filter-form'
+  dblog-filter-clear:
+    id: dblog-filter-clear
+    plugin: text
+    label: 'Clearing messages'
+    body: 'Click <em>Clear log messages</em> to remove the messages from the database.'
+    weight: 3
+    attributes:
+      data-class: 'dblog-clear-log-form'
+  dblog-table-sort:
+    id: dblog-table-sort
+    plugin: text
+    label: 'Sorting messages'
+    body: 'Click on the table headers <em>Type</em>, <em>Date</em> or <em>User</em> to sort the list of messages.'
+    weight: 4
+    attributes:
+      data-class: 'admin-dblog th'
+  dblog-recognize-message:
+    id: dblog-recognize-message
+    plugin: text
+    label: 'Recognizing messages'
+    body: 'The severity of the message is made visible with colors and icons.'
+    weight: 5
+    attributes:
+      data-class: 'admin-dblog tbody > tr td.icon'
+  dblog-table-view:
+    id: dblog-table-view
+    plugin: text
+    label: 'Viewing messages'
+    body: 'Click on the message to get more details such as the location (page that generated the message), the referrer and the hostname where the request originated from.'
+    weight: 5
+    attributes:
+      data-class: 'admin-dblog tbody > tr td.message'
+  dblog-more-information:
+    id: dblog-more-information
+    plugin: text
+    label: 'More information'
+    # URLs are created dynamically based on routes.
+    # @see dblog_tour_tips_alter().
+    body: 'For more information, see [help.page.dblog]<a href="http://drupal.org/documentation/modules/dblog">the online documentation</a>. On the <a href="[system.logging_settings]">configuration</a> page you define which and how much messages should be stored.'
+    weight: 99
diff --git a/core/modules/dblog/config/tour.tour.dblog.yml b/core/modules/dblog/config/tour.tour.dblog.yml
deleted file mode 100644
index ba69450..0000000
--- a/core/modules/dblog/config/tour.tour.dblog.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-id: dblog
-module: dblog
-label: 'Database log'
-langcode: en
-status: true
-routes:
-  - route_name: dblog.overview
-tips:
-  dblog-intro:
-    id: dblog-about
-    plugin: text
-    label: 'Recent log messages'
-    body: "System events such as errors, failed login attempts and content updates are stored as messages in the site's database. On the <em>Recent log messages</em> page you find a chronological list of recorded messages that you can filter and view. You should check the log messages on a regular basis to ensure the site is working properly"
-    weight: 1
-  dblog-filter:
-    id: dblog-filter
-    plugin: text
-    label: 'Filtering messages'
-    body: 'Click on <em>Filter log messages</em> to filter the log messages by <em>Type</em> (usually the name of the module that generated the message) or <em>Severity</em> (emergency, critical, notice, etc).'
-    weight: 2
-    attributes:
-      data-class: 'dblog-filter-form'
-  dblog-filter-clear:
-    id: dblog-filter-clear
-    plugin: text
-    label: 'Clearing messages'
-    body: 'Click <em>Clear log messages</em> to remove the messages from the database.'
-    weight: 3
-    attributes:
-      data-class: 'dblog-clear-log-form'
-  dblog-table-sort:
-    id: dblog-table-sort
-    plugin: text
-    label: 'Sorting messages'
-    body: 'Click on the table headers <em>Type</em>, <em>Date</em> or <em>User</em> to sort the list of messages.'
-    weight: 4
-    attributes:
-      data-class: 'admin-dblog th'
-  dblog-recognize-message:
-    id: dblog-recognize-message
-    plugin: text
-    label: 'Recognizing messages'
-    body: 'The severity of the message is made visible with colors and icons.'
-    weight: 5
-    attributes:
-      data-class: 'admin-dblog tbody > tr td.icon'
-  dblog-table-view:
-    id: dblog-table-view
-    plugin: text
-    label: 'Viewing messages'
-    body: 'Click on the message to get more details such as the location (page that generated the message), the referrer and the hostname where the request originated from.'
-    weight: 5
-    attributes:
-      data-class: 'admin-dblog tbody > tr td.message'
-  dblog-more-information:
-    id: dblog-more-information
-    plugin: text
-    label: 'More information'
-    # URLs are created dynamically based on routes.
-    # @see dblog_tour_tips_alter().
-    body: 'For more information, see [help.page.dblog]<a href="http://drupal.org/documentation/modules/dblog">the online documentation</a>. On the <a href="[system.logging_settings]">configuration</a> page you define which and how much messages should be stored.'
-    weight: 99
diff --git a/core/modules/dblog/lib/Drupal/dblog/Tests/Tour/DbLogTourTest.php b/core/modules/dblog/lib/Drupal/dblog/Tests/Tour/DbLogTourTest.php
index f39fd43..d012e9a 100644
--- a/core/modules/dblog/lib/Drupal/dblog/Tests/Tour/DbLogTourTest.php
+++ b/core/modules/dblog/lib/Drupal/dblog/Tests/Tour/DbLogTourTest.php
@@ -51,7 +51,7 @@ protected function setUp() {
       'user'        => $this->adminUser,
       'uid'         => $this->adminUser->id(),
       'request_uri' => $base_root . request_uri(),
-      'referer'     => $_SERVER['HTTP_REFERER'],
+      'referer'     => \Drupal::request()->server->get('HTTP_REFERER'),
       'ip'          => '127.0.0.1',
       'timestamp'   => REQUEST_TIME,
     );