diff --git a/core/modules/user/config/tour.tour.people.yml b/core/modules/user/config/tour.tour.people.yml
new file mode 100644
index 0000000..1d75ce9
--- /dev/null
+++ b/core/modules/user/config/tour.tour.people.yml
@@ -0,0 +1,30 @@
+id: people
+module: user
+label: 'People'
+langcode: en
+status: '1'
+routes:
+  - route_name: user.admin_account
+tips:
+  people-main:
+    id: people-main
+    plugin: text
+    label: 'Managing users'
+    body: 'This page shows you a list of all of the registered users of your site.'
+    weight: 1
+  people-add:
+    id: people-add
+    plugin: text
+    label: 'Add a user'
+    body: 'Users can register on your site or you can add them manually here.'
+    weight: 2
+    attributes:
+      data-class: 'action-links'
+  people-filter:
+    id: people-filter
+    plugin: text
+    label: 'Search or filter users'
+    body: 'Use this to hide users from the list or search for a specific user.'
+    weight: 3
+    attributes:
+      data-id: 'views-exposed-form-user-admin-people-page-1'
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminTourTest.php b/core/modules/user/lib/Drupal/user/Tests/UserAdminTourTest.php
new file mode 100644
index 0000000..a499f14
--- /dev/null
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAdminTourTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\user\Tests\UserAdminTourTest.
+ */
+
+namespace Drupal\user\Tests;
+
+use Drupal\tour\Tests\TourTestBasic;
+
+/**
+ * Tests tour functionality.
+ */
+class UserAdminTourTest extends TourTestBasic {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('user', 'tour', 'views');
+
+  /**
+   * The pages we want to test for tour tip coverage.
+   *
+   * @var array
+   *   A list of pages to test.
+   */
+  protected $tips = array(
+    'admin/people' => array(),
+  );
+
+  /**
+   * The permissions required for a logged in user to test tour tips.
+   *
+   * @var array
+   *   A list of permissions.
+   */
+  protected $permissions = array('access tour', 'administer users');
+
+
+  public static function getInfo() {
+    return array(
+      'name' => 'User admin tour tests',
+      'description' => 'Tests the User admin tour.',
+      'group' => 'Tour',
+    );
+  }
+
+}