diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php
index cd432a7..2d5871d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php
@@ -144,11 +144,6 @@ function testLookupPath() {
     // recently created language-neutral alias, 'bar'.
     $pathObject->delete(array('langcode' => 'en'));
     $this->assertEqual($aliasManager->getPathAlias($path['source']), 'bar', 'Path lookup falls back to recently created language-neutral alias.');
-
-    // Test the situation where the alias and language are the same, but
-    // the source differs. The newer alias record should be returned.
-    $pathObject->save('user/2', 'bar');
-    $this->assertEqual($aliasManager->getSystemPath('bar'), 'user/2', 'Newer alias record is returned when comparing two LANGUAGE_NOT_SPECIFIED paths with the same alias.');
   }
 
   /**
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index a93a124..e52a6c4 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1196,6 +1196,7 @@ function system_schema() {
       ),
     ),
     'primary key' => array('pid'),
+    'unique keys' => array('alias_langcode' => array('alias', 'langcode')),
     'indexes' => array(
       'alias_langcode_pid' => array('alias', 'langcode', 'pid'),
       'source_langcode_pid' => array('source', 'langcode', 'pid'),
