diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/EmptyLinkPathTest.php b/core/modules/menu_link/lib/Drupal/menu_link/Tests/EmptyLinkPathTest.php
similarity index 79%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/EmptyLinkPathTest.php
rename to core/modules/menu_link/lib/Drupal/menu_link/Tests/EmptyLinkPathTest.php
index a00792e..01df20c 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/EmptyLinkPathTest.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/Tests/EmptyLinkPathTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Menu\EmptyLinkPathTest.
+ * Definition of Drupal\menu_link\Tests\EmptyLinkPathTest.
  */
 
-namespace Drupal\system\Tests\Menu;
+namespace Drupal\menu_link\Tests;
 
 use Drupal\simpletest\WebTestBase;
 
@@ -13,6 +13,9 @@
  * Tests for menu links.
  */
 class EmptyLinkPathTest extends WebTestBase {
+  /**
+   * {@inheritdoc}
+   */
   public static function getInfo() {
     return array(
       'name' => 'Menu link with empty path',
@@ -22,18 +25,18 @@ public static function getInfo() {
   }
 
   /**
-   * Test automatic reparenting of menu links.
+   * Test creation of empty menu links.
    */
   function testEmptyLinkPath($module = 'menu_test') {
     $path = '<none>';
 
     // Verify that the path is valid.
     $path_is_valid = drupal_valid_path($path);
-    $this->assertTrue($path_is_valid, '&lt;none> is a valid path.');
+    $this->assertTrue($path_is_valid, '&lt;none&gt; is a valid path.');
 
     // Verify that url return an empty string.
     $link = url($path);
-    $this->assertEqual($link, '', 'Url &lt;none> return an empty string.');
+    $this->assertEqual($link, '', 'Url &lt;none&gt; return an empty string.');
 
     // Menu link without a path return a span.
     $link_title = 'Empty path';
@@ -50,7 +53,7 @@ function testEmptyLinkPath($module = 'menu_test') {
     $menu_link_string = theme_menu_link($menu_link);
     $expected_link_string = '<span class="no-link">' . $link_title . '</span>';
     $contains_link = (strpos($menu_link_string, $expected_link_string) !== FALSE);
-    $this->assertTrue($contains_link, 'Menu link without path return a span.');
+    $this->assertTrue($contains_link, 'Menu items without a path are displayed as a element.');
 
     // Verify that theme_links() also accept <none> path.
     $links_string = theme_links(array(