diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
index 09e5fe815b..037f43ef57 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
@@ -102,7 +102,7 @@ protected function getEntityCounts() {
       'path_alias' => 8,
       'taxonomy_term' => 15,
       'taxonomy_vocabulary' => 7,
-      'tour' => 5,
+      'tour' => 6,
       'user' => 7,
       'user_role' => 6,
       'menu_link_content' => 10,
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
index 373ddd8efb..ea7601217f 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
@@ -104,7 +104,7 @@ protected function getEntityCounts() {
       'taxonomy_term' => 24,
       'taxonomy_vocabulary' => 7,
       'path_alias' => 8,
-      'tour' => 5,
+      'tour' => 6,
       'user' => 4,
       'user_role' => 3,
       'menu_link_content' => 12,
diff --git a/core/modules/shortcut/config/optional/tour.tour.shortcut-manage.yml b/core/modules/shortcut/config/optional/tour.tour.shortcut-manage.yml
new file mode 100644
index 0000000000..6a6cfb31be
--- /dev/null
+++ b/core/modules/shortcut/config/optional/tour.tour.shortcut-manage.yml
@@ -0,0 +1,42 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - shortcut
+id: shortcut-manage
+label: 'Manage shortcuts'
+module: shortcut
+routes:
+  - route_name: entity.shortcut_set.collection
+tips:
+  shortcuts-general:
+    id: shortcuts-general
+    plugin: text
+    label: 'Shortcuts'
+    weight: 1
+    body: 'Shortcuts allow users to create sets of shortcut links to commonly-visited pages of the site.'
+  shortcut-sets:
+    id: shortcut-sets
+    plugin: text
+    label: 'Shortcut Sets'
+    weight: 2
+    body: 'Shortcuts are contained within sets. The default set generally shows up in the admin toolbar.'
+    attributes:
+      data-class: responsive-enabled
+  add-shortcut-set:
+    id: add-shortcut-set
+    plugin: text
+    label: 'Adding Shortcuts'
+    weight: 3
+    body: 'To add a new shortcut, press Add shortcut set.'
+    attributes:
+      data-class: button-action
+  add-edit-links:
+    id: add-edit-links
+    plugin: text
+    label: 'Adding Links'
+    weight: 4
+    body: 'To add or edit existing links within a set, press List Links.'
+    attributes:
+      data-class: dropbutton-wrapper .dropbutton-widget
+    location: left
diff --git a/core/modules/shortcut/tests/src/Functional/ShortcutTourTest.php b/core/modules/shortcut/tests/src/Functional/ShortcutTourTest.php
new file mode 100644
index 0000000000..266539b932
--- /dev/null
+++ b/core/modules/shortcut/tests/src/Functional/ShortcutTourTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\Tests\shortcut\Functional;
+
+use Drupal\Tests\tour\Functional\TourTestBase;
+
+/**
+ * Tests tour functionality.
+ *
+ * @group shortcut
+ */
+class ShortcutTourTest extends TourTestBase {
+
+  /**
+   * An admin user with administrative permissions for shortcut.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  protected static $modules = ['block', 'shortcut', 'tour'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+    $this->adminUser = $this->drupalCreateUser(['administer shortcuts', 'access tour']);
+    $this->drupalLogin($this->adminUser);
+    $this->drupalPlaceBlock('local_actions_block');
+  }
+
+  /**
+   * Tests Shortcut tour tip availability.
+   */
+  public function testShortcutTourTips() {
+    $this->drupalGet('admin/config/user-interface/shortcut');
+    $this->assertTourTips();
+  }
+
+}