diff --git a/core/modules/language/config/install/tour.tour.language-edit.yml b/core/modules/language/config/install/tour.tour.language-edit.yml
index 55dfbec..f2456a9 100644
--- a/core/modules/language/config/install/tour.tour.language-edit.yml
+++ b/core/modules/language/config/install/tour.tour.language-edit.yml
@@ -19,14 +19,14 @@ tips:
     weight: 2
     attributes:
       data-id: edit-langcode-view
-  language-edit-name:
-    id: language-edit-name
+  language-edit-label:
+    id: language-edit-label
     plugin: text
     label: 'Language name'
     body: '<p>The language name is used throughout the site for all users and is typically written in the same language it represents.</p>'
     weight: 3
     attributes:
-      data-id: edit-name
+      data-id: edit-label
   language-edit-direction:
     id: language-edit-direction
     plugin: text
@@ -34,7 +34,7 @@ tips:
     body: '<p>Choose if the language is a "Left to right" or "Right to left" language.</p><p>Note that not all themes support "Right to left" layouts, so test your theme if you are using "Right to left".</p>'
     weight: 4
     attributes:
-      data-id: edit-direction--description
+      data-id: edit-direction--wrapper--description
   language-edit-continue:
     id: language-edit-continue
     plugin: text
diff --git a/core/modules/language/config/install/tour.tour.language.yml b/core/modules/language/config/install/tour.tour.language.yml
index 12aa206..db22ebf 100644
--- a/core/modules/language/config/install/tour.tour.language.yml
+++ b/core/modules/language/config/install/tour.tour.language.yml
@@ -3,7 +3,7 @@ module: language
 label: Language
 langcode: en
 routes:
-  - route_name: language.admin_overview
+  - route_name: entity.configurable_language.collection
 tips:
   language-overview:
     id: language-overview
diff --git a/core/modules/language/src/Tests/LanguageTourTest.php b/core/modules/language/src/Tests/LanguageTourTest.php
index 5625103..98418b6 100644
--- a/core/modules/language/src/Tests/LanguageTourTest.php
+++ b/core/modules/language/src/Tests/LanguageTourTest.php
@@ -11,6 +11,8 @@
 
 /**
  * Tests tour functionality.
+ *
+ * @group tour
  */
 class LanguageTourTest extends TourTestBase {
 
@@ -28,14 +30,9 @@ class LanguageTourTest extends TourTestBase {
    */
   public static $modules = array('language', 'tour');
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Language tour tests',
-      'description' => 'Tests the Language tours.',
-      'group' => 'Tour',
-    );
-  }
-
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
     $this->adminUser = $this->drupalCreateUser(array('administer languages', 'access tour'));
@@ -50,13 +47,20 @@ public function testLanguageTour() {
     $this->assertTourTips();
   }
 
+  /**
+   * Go to add language page and check the tour tooltips.
+   */
   public function testLanguageAddTour() {
     $this->drupalGet('admin/config/regional/language/add');
     $this->assertTourTips();
   }
 
+  /**
+   * Go to edit language page and check the tour tooltips.
+   */
   public function testLanguageEditTour() {
     $this->drupalGet('admin/config/regional/language/edit/en');
     $this->assertTourTips();
   }
+
 }