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 37de86efcd..b5bcd2bb9c 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
@@ -86,7 +86,7 @@ protected function getEntityCounts() {
       'menu' => 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/NoMultilingualTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php
index a3958a7bf8..85828c75b7 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php
@@ -79,7 +79,7 @@ protected function getEntityCounts() {
       'menu' => 6,
       'taxonomy_term' => 18,
       'taxonomy_vocabulary' => 4,
-      'tour' => 4,
+      'tour' => 5,
       'user' => 4,
       'user_role' => 3,
       'menu_link_content' => 10,
diff --git a/core/modules/user/config/optional/tour.tour.people.yml b/core/modules/user/config/optional/tour.tour.people.yml
new file mode 100644
index 0000000000..e9efbaea27
--- /dev/null
+++ b/core/modules/user/config/optional/tour.tour.people.yml
@@ -0,0 +1,51 @@
+id: people
+module: user
+label: People
+status: true
+langcode: en
+dependencies:
+  module:
+  - user
+routes:
+  -
+    route_name: entity.user.collection
+tips:
+  people-main:
+    id: people-main
+    plugin: text
+    label: 'Managing users'
+    body: 'View and edit user accounts.'
+    weight: 1
+  people-add:
+    id: people-add
+    plugin: text
+    label: 'Add a user'
+    body: 'Create a new user account.'
+    weight: 2
+    attributes:
+      data-class: action-links
+  people-filter:
+    id: people-filter
+    plugin: text
+    label: 'Search for users'
+    body: 'Find users by applying filters.'
+    weight: 3
+    attributes:
+      data-id: views-exposed-form-user-admin-people-page-1
+  people-operations:
+    id: people-operations
+    plugin: text
+    label: 'Update accounts'
+    body: 'Select one or more users via the checkboxes to apply changes to the accounts.'
+    weight: 4
+    attributes:
+      data-id: edit-submit--2
+  people-edit:
+    id: people-edit
+    plugin: text
+    label: 'Edit user account'
+    body: 'Make changes to one user account.'
+    weight: 5
+    location: left
+    attributes:
+      data-class: dropbutton-widget
diff --git a/core/modules/user/src/Tests/UserAdminTourTest.php b/core/modules/user/src/Tests/UserAdminTourTest.php
new file mode 100644
index 0000000000..3182c2194e
--- /dev/null
+++ b/core/modules/user/src/Tests/UserAdminTourTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Drupal\user\Tests;
+
+use Drupal\tour\Tests\TourTestBasic;
+
+/**
+ * Tests tour functionality.
+ *
+ * @group user
+ */
+class UserAdminTourTest extends TourTestBasic {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['user', 'tour', 'views'];
+
+  /**
+   * The pages we want to test for tour tip coverage.
+   *
+   * @var array
+   *   A list of pages to test.
+   */
+  protected $tips = ['admin/people' => []];
+
+  /**
+   * The permissions required for a logged-in user to test tour tips.
+   *
+   * @var array
+   *   A list of permissions.
+   */
+  protected $permissions = ['access tour', 'administer users'];
+
+}