diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldConstraint.php
index e4c3dee..430a612 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldConstraint.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldConstraint.php
@@ -19,7 +19,7 @@
  */
 class UniqueFieldConstraint extends Constraint {
 
-  public $message = 'The %entity_type_id with the %field_name %value already exists.';
+  public $message = 'The %entity_type with the %field_name %value already exists.';
 
   /**
    * {@inheritdoc}
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php
index 76cfd20..7f51054 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php
@@ -39,8 +39,8 @@ public function validate($items, Constraint $constraint) {
     if ($value_taken) {
       $this->context->addViolation($constraint->message, [
         '%value' => $item->value,
-        '%entity_type_id' => $entity_type_id,
-        '%field_name' => $field_name,
+        '%entity_type' => $entity->getEntityType()->getLowercaseLabel(),
+        '%field_name' => $items->getFieldDefinition()->getLabel(),
       ]);
     }
   }
diff --git a/core/modules/user/src/Tests/UserCreateTest.php b/core/modules/user/src/Tests/UserCreateTest.php
index 7a45a05..09e3288 100644
--- a/core/modules/user/src/Tests/UserCreateTest.php
+++ b/core/modules/user/src/Tests/UserCreateTest.php
@@ -116,21 +116,4 @@ public function testUserAdd() {
     }
   }
 
-  /**
-   * Tests the unique user email constraint.
-   */
-  public function testDuplicateUserEmail() {
-    $user1 = $this->drupalCreateUser();
-    $user1->setEmail('test_email@example.com')->save();
-    $violations = $user1->validate();
-    $this->assertEqual(0, $violations->count());
-
-    $user2 = $this->drupalCreateUser();
-    $user2->setEmail('test_email@example.com');
-    $violations = $user2->validate();
-    $this->assertEqual(1, $violations->count());
-    $this->assertEqual('The email address <em class="placeholder">test_email@example.com</em> is already taken.', $violations->get(0)->getMessage());
-    $this->assertEqual('mail', $violations->get(0)->getPropertyPath());
-  }
-
 }