diff --git a/core/modules/system/lib/Drupal/system/Tests/Validation/BundleConstraintValidatorTest.php b/core/modules/system/lib/Drupal/system/Tests/Validation/BundleConstraintValidatorTest.php
new file mode 100644
index 0000000..3b0ba8a
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Tests/Validation/BundleConstraintValidatorTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\system\Tests\Validation\BundleConstraintValidatorTest.
+ */
+
+namespace Drupal\system\Tests\Validation;
+
+use Drupal\simpletest\DrupalUnitTestBase;
+use Drupal\system\Tests\TypedData;
+
+/**
+ * Tests validation constraints for BundleConstraintValidator.
+ */
+class BundleConstraintValidatorTest extends DrupalUnitTestBase {
+
+  /**
+   * The typed data manager to use.
+   *
+   * @var \Drupal\Core\TypedData\TypedDataManager
+   */
+  protected $typedData;
+
+  public static $modules = array('entity', 'node', 'field');
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Entity bundle constraint',
+      'description' => 'Tests validation constraints for BundleConstraintValidator.',
+      'group' => 'Validation',
+    );
+  }
+
+  public function setUp() {
+    parent::setUp();
+    $this->typedData = $this->container->get('typed_data');
+  }
+
+  /**
+   * Tests the constraint validation BundleConstraintValidator.
+   */
+  public function testValidation() {
+    // Test with multiple values.
+    $this->assertValidation(array('foo', 'bar'));
+    // Test with a single string value as well.
+    $this->assertValidation('foo');
+  }
+
+  /**
+   * Executes the BundleConstraintValidator test for a given bundle.
+   *
+   * @param string|array $bundle
+   *   Bundle/bundles to use as constraint.
+   */
+  protected function assertValidation($bundle) {
+    // Create a typed data definition with a Bundle constraint.
+    $definition = array(
+      'type' => 'entity_reference',
+      'constraints' => array(
+        'Bundle' => $bundle,
+      ),
+    );
+
+    // Test the validation.
+    $article_node = $this->container->get('entity.manager')->getStorageController('node')->create(array('type' => 'foo'));
+
+    $typed_data = $this->typedData->create($definition, $article_node);
+    $violations = $typed_data->validate();
+    $this->assertEqual($violations->count(), 0, 'Validation passed for correct value.');
+
+    // Test the validation when an invalid value is passed.
+    $page_node = $this->container->get('entity.manager')->getStorageController('node')->create(array('type' => 'baz'));
+
+    $typed_data = $this->typedData->create($definition, $page_node);
+    $violations = $typed_data->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation failed for incorrect value.');
+
+    // Make sure the information provided by a violation is correct.
+    $violation = $violations[0];
+    $this->assertEqual($violation->getMessage(), t('The entity must be of bundle %bundle.', array('%bundle' => implode(', ', (array) $bundle))), 'The message for invalid value is correct.');
+    $this->assertEqual($violation->getRoot(), $typed_data, 'Violation root is correct.');
+    $this->assertEqual($violation->getInvalidValue(), $page_node, 'The invalid value is set correctly in the violation.');
+  }
+}