diff --git a/core/modules/system/lib/Drupal/system/Tests/Validation/ComplexDataConstraintValidatorTest.php b/core/modules/system/lib/Drupal/system/Tests/Validation/ComplexDataConstraintValidatorTest.php
index c11ff04..2b0af2f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Validation/ComplexDataConstraintValidatorTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Validation/ComplexDataConstraintValidatorTest.php
@@ -32,7 +32,7 @@ public static function getInfo() {
 
   public function setUp() {
     parent::setUp();
-    $this->typedData = $this->container->get('typed_data');
+    $this->typedData = $this->container->get('typed_data_manager');
   }
 
   /**
@@ -69,7 +69,7 @@ public function testValidation() {
     // should be ignored as long as there is no NotNull or NotBlank constraint.
     $typed_data = $this->typedData->create($definition, array('foo' => 'bar'));
     $violations = $typed_data->validate();
-    $this->assertEqual($violations->count(), 0, 'Not existing key is ignored.');
+    $this->assertEqual($violations->count(), 0, 'Constraint on non-existing key is ignored.');
 
     $definition = DataDefinition::create('map')
       ->addConstraint('ComplexData', array(