diff --git a/core/lib/Drupal/Core/TypedData/TypedData.php b/core/lib/Drupal/Core/TypedData/TypedData.php
index 3216d21..c81f7c3 100644
--- a/core/lib/Drupal/Core/TypedData/TypedData.php
+++ b/core/lib/Drupal/Core/TypedData/TypedData.php
@@ -138,7 +138,14 @@ public function getConstraints() {
    */
   public function validate() {
     // @todo: Add the typed data manager as proper dependency.
-    return \Drupal::typedDataManager()->getValidator()->validate($this);
+    if ($this instanceof PrimitiveInterface) {
+      // Primitive data is always validated unwrapped. For that to work we have
+      // to manually pass on the constraints.
+      return \Drupal::typedDataManager()->getValidator()->validate($this->getValue(), $this->getConstraints());
+    }
+    else {
+      return \Drupal::typedDataManager()->getValidator()->validate($this);
+    }
   }
 
   /**
diff --git a/core/lib/Drupal/Core/TypedData/TypedDataManager.php b/core/lib/Drupal/Core/TypedData/TypedDataManager.php
old mode 100644
new mode 100755
index 7fe362e..39142e1
--- a/core/lib/Drupal/Core/TypedData/TypedDataManager.php
+++ b/core/lib/Drupal/Core/TypedData/TypedDataManager.php
@@ -335,7 +335,7 @@ public function getValidator() {
         ->setMetadataFactory(new MetadataFactory())
         ->setTranslator(new DrupalTranslator())
         ->setConstraintValidatorFactory(new ConstraintValidatorFactory($this->classResolver))
-        ->setApiVersion(Validation::API_VERSION_2_4)
+        ->setApiVersion(Validation::API_VERSION_2_5)
         ->getValidator();
     }
     return $this->validator;
diff --git a/core/lib/Drupal/Core/TypedData/Validation/Metadata.php b/core/lib/Drupal/Core/TypedData/Validation/Metadata.php
old mode 100644
new mode 100755
index 73bfc8b..6eba413
--- a/core/lib/Drupal/Core/TypedData/Validation/Metadata.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/Metadata.php
@@ -7,98 +7,40 @@
 
 namespace Drupal\Core\TypedData\Validation;
 
-use Drupal\Core\TypedData\TypedDataInterface;
-use Symfony\Component\Validator\ValidationVisitorInterface;
-use Symfony\Component\Validator\PropertyMetadataInterface;
+use Symfony\Component\Validator\Exception\BadMethodCallException;
+use Symfony\Component\Validator\Mapping\CascadingStrategy;
 
 /**
- * Typed data implementation of the validator MetadataInterface.
+ * Validator metadata for typed data objects containing no properties.
  */
-class Metadata implements PropertyMetadataInterface {
+class Metadata extends MetadataBase {
 
   /**
-   * The name of the property, or empty if this is the root.
-   *
-   * @var string
+   * {@inheritdoc}
    */
-  protected $name;
-
-  /**
-   * The typed data object the metadata is about.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataInterface
-   */
-  protected $typedData;
-
-  /**
-   * The metadata factory used.
-   *
-   * @var \Drupal\Core\TypedData\Validation\MetadataFactory
-   */
-  protected $factory;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\Core\TypedData\TypedDataInterface $typed_data
-   *   The typed data object the metadata is about.
-   * @param $name
-   *   The name of the property to get metadata for. Leave empty, if
-   *   the data is the root of the typed data tree.
-   * @param \Drupal\Core\TypedData\Validation\MetadataFactory $factory
-   *   The factory to use for instantiating property metadata.
-   */
-  public function __construct(TypedDataInterface $typed_data, $name = '', MetadataFactory $factory) {
-    $this->typedData = $typed_data;
-    $this->name = $name;
-    $this->factory = $factory;
+  public function getConstrainedProperties() {
+    return [];
   }
 
   /**
-   * Implements MetadataInterface::accept().
+   * {@inheritdoc}
    */
-  public function accept(ValidationVisitorInterface $visitor, $typed_data, $group, $propertyPath) {
-
-    // @todo: Do we have to care about groups? Symfony class metadata has
-    // $propagatedGroup.
-
-    $visitor->visit($this, $typed_data->getValue(), $group, $propertyPath);
+  public function hasPropertyMetadata($property_name) {
+    return [];
   }
 
   /**
-   * Implements MetadataInterface::findConstraints().
+   * {@inheritdoc}
    */
-  public function findConstraints($group) {
-    return $this->typedData->getConstraints();
+  public function getPropertyMetadata($property_name) {
+    throw new BadMethodCallException("The data does not contain any properties.");
   }
 
   /**
-   * Returns the name of the property.
-   *
-   * @return string The property name.
+   * {@inheritdoc}
    */
-  public function getPropertyName() {
-    return $this->name;
+  public function getCascadingStrategy() {
+    return CascadingStrategy::NONE;
   }
 
-  /**
-   * Extracts the value of the property from the given container.
-   *
-   * @param mixed $container The container to extract the property value from.
-   *
-   * @return mixed The value of the property.
-   */
-  public function getPropertyValue($container) {
-    return $this->typedData->getValue();
-  }
-
-  /**
-   * Returns the typed data object.
-   *
-   * @return \Drupal\Core\TypedData\TypedDataInterface
-   *   The typed data object.
-   */
-  public function getTypedData() {
-    return $this->typedData;
-  }
 }
diff --git a/core/lib/Drupal/Core/TypedData/Validation/MetadataBase.php b/core/lib/Drupal/Core/TypedData/Validation/MetadataBase.php
new file mode 100755
index 0000000..8380fa0
--- /dev/null
+++ b/core/lib/Drupal/Core/TypedData/Validation/MetadataBase.php
@@ -0,0 +1,145 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\TypedData\Validation\MetadataBase.
+ */
+
+namespace Drupal\Core\TypedData\Validation;
+
+use Drupal\Core\TypedData\ComplexDataInterface;
+use Drupal\Core\TypedData\ListInterface;
+use Drupal\Core\TypedData\TypedDataInterface;
+use Symfony\Component\Validator\Mapping\ClassMetadataInterface;
+use Symfony\Component\Validator\Mapping\PropertyMetadataInterface;
+use Symfony\Component\Validator\Mapping\TraversalStrategy;
+use Symfony\Component\Validator\ValidationVisitorInterface;
+
+/**
+ * Common base class for implementing validator metadata for typed data objects.
+ */
+abstract class MetadataBase implements ClassMetadataInterface, PropertyMetadataInterface {
+
+  /**
+   * The typed data object the metadata is about.
+   *
+   * @var \Drupal\Core\TypedData\TypedDataInterface
+   */
+  protected $typedData;
+
+  /**
+   * The metadata factory used.
+   *
+   * @var \Drupal\Core\TypedData\Validation\MetadataFactory
+   */
+  protected $factory;
+
+  /**
+   * Constructs the object.
+   *
+   * @param \Drupal\Core\TypedData\TypedDataInterface $typed_data
+   *   The typed data object the metadata is about.
+   * @param \Drupal\Core\TypedData\Validation\MetadataFactory $factory
+   *   The factory to use for instantiating property metadata.
+   */
+  public function __construct(TypedDataInterface $typed_data, MetadataFactory $factory) {
+    $this->typedData = $typed_data;
+    $this->factory = $factory;
+  }
+
+  /**
+   * Returns the typed data object.
+   *
+   * @return \Drupal\Core\TypedData\TypedDataInterface
+   *   The typed data object.
+   */
+  public function getTypedData() {
+    return $this->typedData;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function accept(ValidationVisitorInterface $visitor, $typed_data, $group, $propertyPath) {
+
+    // @todo: Do we have to care about groups? Symfony class metadata has
+    // $propagatedGroup.
+    throw new BadMethodCallException('Not supported.');
+
+    $visitor->visit($this, $typed_data->getValue(), $group, $propertyPath);
+  }
+
+
+  /**
+   * {@inheritdoc}
+   */
+  public function findConstraints($group) {
+    return $this->typedData->getConstraints();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConstraints() {
+    return $this->typedData->getConstraints();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTraversalStrategy() {
+    return TraversalStrategy::NONE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getClassName() {
+    return get_class($this->typedData);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getGroupSequence() {
+    return NULL;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function hasGroupSequence() {
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isGroupSequenceProvider() {
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPropertyName() {
+    return $this->typedData->getName();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPropertyValue($container) {
+    $property = $container->get($this->getPropertyName());
+    if ($property instanceof ListInterface || $property instanceof ComplexDataInterface) {
+      // To let all constraints properly handle empty structures, pass on NULL
+      // if the data structure is empty. That way existing NotNull or NotBlank
+      // constraints work as expected.
+      return !$property->isEmpty() ? $property : NULL;
+    }
+    else {
+      return $property->getValue();
+    }
+  }
+
+}
diff --git a/core/lib/Drupal/Core/TypedData/Validation/MetadataFactory.php b/core/lib/Drupal/Core/TypedData/Validation/MetadataFactory.php
old mode 100644
new mode 100755
index 2858daf..2d52915
--- a/core/lib/Drupal/Core/TypedData/Validation/MetadataFactory.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/MetadataFactory.php
@@ -10,7 +10,7 @@
 use Drupal\Core\TypedData\ComplexDataInterface;
 use Drupal\Core\TypedData\ListInterface;
 use Drupal\Core\TypedData\TypedDataInterface;
-use Symfony\Component\Validator\MetadataFactoryInterface;
+use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
 
 /**
  * Typed data implementation of the validator MetadataFactoryInterface.
@@ -18,27 +18,25 @@
 class MetadataFactory implements MetadataFactoryInterface {
 
   /**
-   * Implements MetadataFactoryInterface::getMetadataFor().
+   * {@inheritdoc}
    *
    * @param \Drupal\Core\TypedData\TypedDataInterface $typed_data
    *   Some typed data object containing the value to validate.
-   * @param $name
-   *   (optional) The name of the property to get metadata for. Leave empty, if
-   *   the data is the root of the typed data tree.
    */
-  public function getMetadataFor($typed_data, $name = '') {
+  public function getMetadataFor($typed_data) {
     if (!$typed_data instanceof TypedDataInterface) {
       throw new \InvalidArgumentException('The passed value must be a typed data object.');
     }
     $is_container = $typed_data instanceof ComplexDataInterface || $typed_data instanceof ListInterface;
     $class = '\Drupal\Core\TypedData\Validation\\' . ($is_container ? 'PropertyContainerMetadata' : 'Metadata');
-    return new $class($typed_data, $name, $this);
+    return new $class($typed_data, $this);
   }
 
   /**
-   * Implements MetadataFactoryInterface::hasMetadataFor().
+   * {@inheritdoc}
    */
   public function hasMetadataFor($value) {
     return $value instanceof TypedDataInterface;
   }
+
 }
diff --git a/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php b/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php
index f5850eb..1755a1f 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php
@@ -9,18 +9,20 @@
 
 use Drupal\Core\TypedData\ComplexDataInterface;
 use Drupal\Core\TypedData\ListInterface;
-use Symfony\Component\Validator\PropertyMetadataContainerInterface;
+use Symfony\Component\Validator\Mapping\CascadingStrategy;
 use Symfony\Component\Validator\ValidationVisitorInterface;
 
 /**
- * Typed data implementation of the validator MetadataInterface.
+ * Validator metadata for typed data property containers.
  */
-class PropertyContainerMetadata extends Metadata implements PropertyMetadataContainerInterface {
+class PropertyContainerMetadata extends MetadataBase {
 
   /**
-   * Overrides Metadata::accept().
+   * {@inheritdoc}
    */
   public function accept(ValidationVisitorInterface $visitor, $typed_data, $group, $propertyPath) {
+    throw new BadMethodCallException('Not supported.');
+
     // To let all constraints properly handle empty structures, pass on NULL
     // if the data structure is empty. That way existing NotNull or NotBlank
     // constraints work as expected.
@@ -39,7 +41,7 @@ public function accept(ValidationVisitorInterface $visitor, $typed_data, $group,
   }
 
   /**
-   * Implements PropertyMetadataContainerInterface::hasPropertyMetadata().
+   * {@inheritdoc}
    */
   public function hasPropertyMetadata($property_name) {
     try {
@@ -52,17 +54,39 @@ public function hasPropertyMetadata($property_name) {
   }
 
   /**
-   * Implements PropertyMetadataContainerInterface::getPropertyMetadata().
+   * {@inheritdoc}
    */
   public function getPropertyMetadata($property_name) {
+    if ($this->typedData instanceof ListInterface || $this->typedData instanceof ComplexDataInterface) {
+      return array($this->factory->getMetadataFor($this->typedData->get($property_name)));
+    }
+    else {
+      throw new \LogicException("There are no known properties.");
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConstrainedProperties() {
     if ($this->typedData instanceof ListInterface) {
-      return array(new Metadata($this->typedData[$property_name], $property_name));
+      // @todo: When https://www.drupal.org/node/2164601 gets committed,
+      // simplify this to return the list indexes based on the list count.
+      return array_keys(iterator_to_array($this->typedData));
     }
     elseif ($this->typedData instanceof ComplexDataInterface) {
-      return array(new Metadata($this->typedData->get($property_name), $property_name));
+      return array_keys($this->typedData->getProperties());
     }
     else {
       throw new \LogicException("There are no known properties.");
     }
   }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCascadingStrategy() {
+    return CascadingStrategy::CASCADE;
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraintValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraintValidator.php
index efc6906..f2affab 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraintValidator.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraintValidator.php
@@ -21,20 +21,22 @@ class AllowedValuesConstraintValidator extends ChoiceValidator {
    * {@inheritdoc}
    */
   public function validate($value, Constraint $constraint) {
-    $typed_data = $this->context->getMetadata()->getTypedData();
-
-    if ($typed_data instanceof OptionsProviderInterface) {
-      $account = \Drupal::currentUser();
-      $allowed_values = $typed_data->getSettableValues($account);
-      $constraint->choices = $allowed_values;
-
-      // If the data is complex, we have to validate its main property.
-      if ($typed_data instanceof ComplexDataInterface) {
-        $name = $typed_data->getDataDefinition()->getMainPropertyName();
-        if (!isset($name)) {
-          throw new \LogicException('Cannot validate allowed values for complex data without a main property.');
+    if (!isset($constraint->choices)) {
+      $typed_data = $this->context->getMetadata()->getTypedData();
+
+      if ($typed_data instanceof OptionsProviderInterface) {
+        $account = \Drupal::currentUser();
+        $allowed_values = $typed_data->getSettableValues($account);
+        $constraint->choices = $allowed_values;
+
+        // If the data is complex, we have to validate its main property.
+        if ($typed_data instanceof ComplexDataInterface) {
+          $name = $typed_data->getDataDefinition()->getMainPropertyName();
+          if (!isset($name)) {
+            throw new \LogicException('Cannot validate allowed values for complex data without a main property.');
+          }
+          $value = $typed_data->get($name)->getValue();
         }
-        $value = $typed_data->get($name)->getValue();
       }
     }
 
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraintValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraintValidator.php
old mode 100644
new mode 100755
index 31ffc5b..ab17ff2
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraintValidator.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraintValidator.php
@@ -8,6 +8,7 @@
 namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
 
 use Drupal\Core\TypedData\ComplexDataInterface;
+use Drupal\Core\TypedData\ListInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
@@ -18,6 +19,11 @@
 class ComplexDataConstraintValidator extends ConstraintValidator {
 
   /**
+   * @var \Symfony\Component\Validator\Context\ExecutionContextInterface
+   */
+  protected $context;
+
+  /**
    * {@inheritdoc}
    */
   public function validate($value, Constraint $constraint) {
@@ -38,10 +44,16 @@ public function validate($value, Constraint $constraint) {
         $property = $property->getValue();
       }
       elseif ($property->isEmpty()) {
-        // @see \Drupal\Core\TypedData\Validation\PropertyContainerMetadata::accept();
+        // @see \Drupal\Core\TypedData\Validation\ClassMetadata::accept();
         $property = NULL;
       }
-      $this->context->validateValue($property, $constraints, $name, $group);
+
+      $this->context->setNode($value, $property, $this->context->getMetadata(), $name);
+
+      $this->context
+        ->getValidator()
+        ->inContext($this->context)
+        ->validate($property, $constraints, $group);
     }
   }
 }
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
index d1bdc0f..adda409 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
@@ -32,6 +32,8 @@ public function validate($value, Constraint $constraint) {
       return;
     }
 
+    // @todo: Rewrite this to avoid relying on our own metadata class?
+    return;
     $typed_data = $this->context->getMetadata()->getTypedData();
     $valid = TRUE;
     if ($typed_data instanceof BinaryInterface && !is_resource($value)) {
diff --git a/core/modules/simpletest/src/Annotation/group.php b/core/modules/simpletest/src/Annotation/group.php
new file mode 100644
index 0000000..4944a0b
--- /dev/null
+++ b/core/modules/simpletest/src/Annotation/group.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\simpletest\Annotation\Group.
+ */
+
+namespace Drupal\simpletest\Annotation;
+
+/**
+ * @Annotation
+ */
+class group {
+
+  public function __construct($values) {
+    $this->values;
+  }
+
+  public function get() {
+    return $this->values;
+  }
+
+}
diff --git a/core/modules/simpletest/src/TestDiscovery.php b/core/modules/simpletest/src/TestDiscovery.php
index 50e19f0..6e7d1e5 100644
--- a/core/modules/simpletest/src/TestDiscovery.php
+++ b/core/modules/simpletest/src/TestDiscovery.php
@@ -8,6 +8,10 @@
 namespace Drupal\simpletest;
 
 use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
+use Doctrine\Common\Annotations\SimpleAnnotationReader;
+use Doctrine\Common\Reflection\StaticReflectionParser;
+use Drupal\Component\Annotation\Reflection\MockFileFinder;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\Extension;
 use Drupal\Core\Extension\ExtensionDiscovery;
@@ -128,6 +132,9 @@ public function registerTestNamespaces() {
    * @todo Add base class groups 'Kernel' + 'Web', complementing 'PHPUnit'.
    */
   public function getTestClasses($extension = NULL) {
+    $reader = new SimpleAnnotationReader();
+    $reader->addNamespace('Drupal\\simpletest\\Annotation');
+
     if (!isset($extension)) {
       if ($this->cacheBackend && $cache = $this->cacheBackend->get('simpletest:discovery:classes')) {
         return $cache->data;
@@ -144,6 +151,16 @@ public function getTestClasses($extension = NULL) {
     $this->classLoader->addClassMap($classmap);
 
     foreach ($classmap as $classname => $pathname) {
+
+      // Clear the annotation loaders of any previous annotation classes.
+      AnnotationRegistry::reset();
+      // Register the namespaces of classes that can be used for annotations.
+      AnnotationRegistry::registerLoader('class_exists');
+      $finder = MockFileFinder::create($pathname);
+      $parser = new StaticReflectionParser($classname, $finder, TRUE);
+      $annotation = $reader->getClassAnnotations($parser->getReflectionClass());
+
+      $a = 123;
       try {
         $class = new \ReflectionClass($classname);
       }
@@ -311,42 +328,13 @@ public static function getTestInfo(\ReflectionClass $class) {
       throw new \LogicException(sprintf('Missing PHPDoc summary line on %s in %s.', $classname, $class->getFileName()));
     }
 
+    if (isset($annotations['dependencies'])) {
+      $info['requires']['module'] = array_merge($info['requires']['module'], explode(',', $annotations['dependencies']));
+    }
+
     // Reduce to @group and @requires.
     $info += array_intersect_key($annotations, array('group' => 1, 'requires' => 1));
 
-    // @todo Remove legacy getInfo() methods.
-    if (method_exists($classname, 'getInfo')) {
-      $legacy_info = $classname::getInfo();
-
-      // Derive the primary @group from the namespace to ensure that legacy
-      // tests are not located in different groups than converted tests.
-      $classparts = explode('\\', $classname);
-      if ($classparts[1] === 'Tests') {
-        if ($classparts[2] === 'Component' || $classparts[2] === 'Core') {
-          // Drupal\Tests\Component\{group}\...
-          $info['group'][] = $classparts[3];
-        }
-        else {
-          // Drupal\Tests\{group}\...
-          $info['group'][] = $classparts[2];
-        }
-      }
-      elseif ($classparts[1] === 'system' && $classparts[3] !== 'System') {
-        // Drupal\system\Tests\{group}\...
-        $info['group'][] = $classparts[3];
-      }
-      else {
-        // Drupal\{group}\Tests\...
-        $info['group'][] = $classparts[1];
-      }
-
-      if (isset($legacy_info['dependencies'])) {
-        $info += array('requires' => array());
-        $info['requires'] += array('module' => array());
-        $info['requires']['module'] = array_merge($info['requires']['module'], $legacy_info['dependencies']);
-      }
-    }
-
     // Process @group information.
     // @todo Support multiple @groups + change UI to expose a group select
     //   dropdown to filter tests by group instead of collapsible table rows.
diff --git a/core/modules/system/src/Tests/Validation/AllowedValuesConstraintValidatorTest.php b/core/modules/system/src/Tests/Validation/AllowedValuesConstraintValidatorTest.php
index a5242c1..7083649 100644
--- a/core/modules/system/src/Tests/Validation/AllowedValuesConstraintValidatorTest.php
+++ b/core/modules/system/src/Tests/Validation/AllowedValuesConstraintValidatorTest.php
@@ -52,7 +52,7 @@ public function testValidation() {
     // Make sure the information provided by a violation is correct.
     $violation = $violations[0];
     $this->assertEqual($violation->getMessage(), t('The value you selected is not a valid choice.'), 'The message for invalid value is correct.');
-    $this->assertEqual($violation->getRoot(), $typed_data, 'Violation root is correct.');
+    $this->assertEqual($violation->getRoot(), 4, 'Violation root is correct.');
     $this->assertEqual($violation->getInvalidValue(), 4, 'The invalid value is set correctly in the violation.');
   }