diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 8127a912541c47a9a26d0622244045a5558c0c1a..cdeece7764ba2d63f3d6d3683b1645d694877eab 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -173,7 +173,7 @@ function path_form_element_validate($element, &$form_state, $complete_form) {
     $query->addExpression('1');
     $query->range(0, 1);
     if ($query->execute()->fetchField()) {
-      form_set_error('alias', t('The alias is already in use.'));
+      form_error($element, t('The alias is already in use.'));
     }
   }
 }
diff --git a/core/modules/path/path.test b/core/modules/path/path.test
index 3072150d43404c51cd174f3f8598d07c6ec8fd0e..7b6b2f2e9e55c55e70cab01af2d5ff3bd1b953db 100644
--- a/core/modules/path/path.test
+++ b/core/modules/path/path.test
@@ -162,6 +162,23 @@ class PathTestCase extends DrupalWebTestCase {
   function getPID($alias) {
     return db_query("SELECT pid FROM {url_alias} WHERE alias = :alias", array(':alias' => $alias))->fetchField();
   }
+
+  /**
+   * Tests that duplicate aliases fail validation.
+   */
+  function testDuplicateNodeAlias() {
+    // Create one node with a random alias.
+    $node_one = $this->drupalCreateNode();
+    $edit = array();
+    $edit['path[alias]'] = $this->randomName();
+    $this->drupalPost('node/' . $node_one->nid . '/edit', $edit, t('Save'));
+
+    // Now create another node and try to set the same alias.
+    $node_two = $this->drupalCreateNode();
+    $this->drupalPost('node/' . $node_two->nid . '/edit', $edit, t('Save'));
+    $this->assertText(t('The alias is already in use.'));
+    $this->assertFieldByXPath("//input[@name='path[alias]' and contains(@class, 'error')]", $edit['path[alias]'], 'Textfield exists and has the error class.');
+  }
 }
 
 /**