diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
index 8308937d4a..fef070bcff 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -95,6 +95,8 @@ class ReplaceAliasByActualDefinitionPass implements CompilerPassInterface
             $definition->setProperties(
                 $this->updateArgumentReferences($definition->getProperties(), $currentId, $newId)
             );
+
+            $definition->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(), $currentId, $newId));
         }
     }
 
@@ -122,4 +124,13 @@ class ReplaceAliasByActualDefinitionPass implements CompilerPassInterface
 
         return $arguments;
     }
+
+    private function updateFactoryServiceReference($factoryService, $currentId, $newId)
+    {
+        if (null === $factoryService) {
+            return;
+        }
+
+        return $currentId === $factoryService ? $newId : $currentId;
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
index e4d22401d3..ac1609f5d7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
@@ -21,7 +21,9 @@ class ReplaceAliasByActualDefinitionPassTest extends \PHPUnit_Framework_TestCase
     {
         $container = new ContainerBuilder();
 
-        $container->register('a', '\stdClass');
+        $aDefinition = $container->register('a', '\stdClass');
+        $aDefinition->setFactoryService('b');
+        $aDefinition->setFactoryMethod('createA');
 
         $bDefinition = new Definition('\stdClass');
         $bDefinition->setPublic(false);
@@ -39,6 +41,7 @@ class ReplaceAliasByActualDefinitionPassTest extends \PHPUnit_Framework_TestCase
             $container->has('b_alias') && !$container->hasAlias('b_alias'),
             '->process() replaces alias to actual.'
         );
+        $this->assertSame('b_alias', $aDefinition->getFactoryService());
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php
new file mode 100644
index 0000000000..7596b879a1
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Resources;
+
+class TranslationFilesTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideTranslationFiles
+     */
+    public function testTranslationFileIsValid($filePath)
+    {
+        \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+    }
+
+    public function provideTranslationFiles()
+    {
+        return array_map(
+            function ($filePath) { return (array) $filePath; },
+            glob(dirname(dirname(__DIR__)).'/Resources/translations/*.xlf')
+        );
+    }
+}
diff --git a/src/Symfony/Component/Security/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Security/Tests/Resources/TranslationFilesTest.php
new file mode 100644
index 0000000000..341ec87ea4
--- /dev/null
+++ b/src/Symfony/Component/Security/Tests/Resources/TranslationFilesTest.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Tests\Resources;
+
+class TranslationFilesTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideTranslationFiles
+     */
+    public function testTranslationFileIsValid($filePath)
+    {
+        \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+    }
+
+    public function provideTranslationFiles()
+    {
+        return array_map(
+            function ($filePath) { return (array) $filePath; },
+            glob(dirname(dirname(__DIR__)).'/Resources/translations/*.xlf')
+        );
+    }
+}
diff --git a/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php
new file mode 100644
index 0000000000..8a766611cd
--- /dev/null
+++ b/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Resources;
+
+class TranslationFilesTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideTranslationFiles
+     */
+    public function testTranslationFileIsValid($filePath)
+    {
+        \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+    }
+
+    public function provideTranslationFiles()
+    {
+        return array_map(
+            function ($filePath) { return (array) $filePath; },
+            glob(dirname(dirname(__DIR__)).'/Resources/translations/*.xlf')
+        );
+    }
+}