diff --git a/core/modules/user/config/tour.tour.user-edit.yml b/core/modules/user/config/tour.tour.user-edit.yml
new file mode 100644
index 0000000..b800ac7
--- /dev/null
+++ b/core/modules/user/config/tour.tour.user-edit.yml
@@ -0,0 +1,33 @@
+id: user-edit
+module: user
+label: User edit
+langcode: en
+routes:
+  - route_name: user.edit
+  - route_name: user.admin_create
+tips:
+  edit-account:
+    id: edit-account
+    plugin: text
+    label: 'Login Credentials'
+    body: 'The <em>username</em> and <em>password</em> are needed for the user to login. The <em>E-Mail address</em> has to be unique.'
+    weight: 1
+    location: top
+    attributes:
+      data-id: edit-account
+  edit-status:
+    id: edit-status
+    plugin: text
+    label: 'The status'
+    body: 'The status determinates if the user is able to login or not. It&lsquo;s useful in case that new accounts need administrator approval before being active. The default value for new accounts can be changed <a href="[site:url]admin/config/people/accounts#edit-registration-cancellation">account settings</a>.'
+    weight: 2
+    attributes:
+      data-id: edit-status
+  edit-roles:
+    id: edit-roles
+    plugin: text
+    label: 'The roles'
+    body: '<a href="[site:url]admin/people/roles">Roles</a> are needed to grant and revoke prermissions for the user to access different parts of the system.'
+    weight: 3
+    attributes:
+      data-id: edit-roles
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEditTourTest.php b/core/modules/user/lib/Drupal/user/Tests/UserEditTourTest.php
new file mode 100644
index 0000000..8dd129a
--- /dev/null
+++ b/core/modules/user/lib/Drupal/user/Tests/UserEditTourTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\user\Tests\UserEditTourTest.
+ */
+
+namespace Drupal\user\Tests;
+
+use Drupal\tour\Tests\TourTestBasic;
+
+/**
+ * Tests tour functionality.
+ */
+class UserEditTourTest extends TourTestBasic {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('user', 'tour', 'image');
+
+  /**
+   * 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', 'administer permissions');
+
+  /**
+   * The pages we want to test for tour tip coverage.
+   *
+   * @var array
+   *   A list of pages to test.
+   */
+  protected $tips = array(
+    'user/1/edit' => array(),
+  );
+
+  public static function getInfo() {
+    return array(
+      'name' => 'User edit UI tour tests',
+      'description' => 'Tests the User edit UI tour.',
+      'group' => 'Tour',
+    );
+  }
+
+}