diff --git a/src/Symfony/Component/Validator/Tests/ExecutionContextTest.php b/src/Symfony/Component/Validator/Tests/ExecutionContextTest.php
index b35128a147..3387e309f8 100644
--- a/src/Symfony/Component/Validator/Tests/ExecutionContextTest.php
+++ b/src/Symfony/Component/Validator/Tests/ExecutionContextTest.php
@@ -13,10 +13,10 @@ namespace Symfony\Component\Validator\Tests;
 
 use Symfony\Component\Validator\Constraints\Collection;
 use Symfony\Component\Validator\Constraints\All;
-use Symfony\Component\Validator\ConstraintValidatorFactory;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\ExecutionContext;
+use Symfony\Component\Validator\LegacyConstraintValidatorFactory;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 use Symfony\Component\Validator\ValidationVisitor;
 
@@ -313,7 +313,7 @@ class ExecutionContextTest extends \PHPUnit_Framework_TestCase
             '[name]'
         );
 
-        $visitor = new ValidationVisitor('Root', $this->metadataFactory, new ConstraintValidatorFactory(), $this->translator);
+        $visitor = new ValidationVisitor('Root', $this->metadataFactory, new LegacyConstraintValidatorFactory(), $this->translator);
         $context = new ExecutionContext($visitor, $this->translator, self::TRANS_DOMAIN);
         $context->validateValue($data, $constraints);
 
diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php
index 684668fb8b..e06c2feccf 100644
--- a/src/Symfony/Component/Validator/ValidatorBuilder.php
+++ b/src/Symfony/Component/Validator/ValidatorBuilder.php
@@ -397,7 +397,7 @@ class ValidatorBuilder implements ValidatorBuilderInterface
         }
 
         if (Validation::API_VERSION_2_5 === $apiVersion) {
-            $contextFactory = new ExecutionContextFactory($metadataFactory, $translator, $this->translationDomain);
+            $contextFactory = new ExecutionContextFactory($translator, $this->translationDomain);
             $validatorFactory = $validatorFactory ?: new ConstraintValidatorFactory($this->propertyAccessor);
 
             return new RecursiveValidator($contextFactory, $metadataFactory, $validatorFactory, $this->initializers);