diff --git a/.travis.yml b/.travis.yml
index 44330620ac..f07b4170e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ matrix:
         - php: 5.5
         - php: 5.6
         - php: 5.3
-          env: components=low
+          env: components=low SYMFONY_DEPRECATIONS_HELPER=weak
         - php: 5.6
           env: components=high
         - php: hhvm-nightly
@@ -20,6 +20,7 @@ services: mongodb
 env:
     global:
         - components=no
+        - SYMFONY_DEPRECATIONS_HELPER=strict
 
 before_install:
     - travis_retry sudo apt-get install parallel
@@ -40,5 +41,5 @@ install:
 script:
     - if [ "$components" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
     - if [ "$components" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi;
-    - if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
+    - if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data,legacy || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
     - if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
diff --git a/composer.json b/composer.json
index c45d2f443c..893be24806 100644
--- a/composer.json
+++ b/composer.json
@@ -45,6 +45,7 @@
         "symfony/locale": "self.version",
         "symfony/monolog-bridge": "self.version",
         "symfony/options-resolver": "self.version",
+        "symfony/phpunit-bridge": "self.version",
         "symfony/process": "self.version",
         "symfony/property-access": "self.version",
         "symfony/proxy-manager-bridge": "self.version",
@@ -86,6 +87,9 @@
         ],
         "files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" ]
     },
+    "autoload-dev": {
+        "files": [ "src/Symfony/Bridge/PhpUnit/bootstrap.php" ]
+    },
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 25bff1fbcc..726b91ef23 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -4,16 +4,13 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="autoload.php.dist"
+         bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
-
-        <ini name="intl.default_locale" value="en"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="memory_limit" value="-1"/>
+        <ini name="error_reporting" value="-1" />
+        <ini name="intl.default_locale" value="en" />
+        <ini name="intl.error_level" value="0" />
+        <ini name="memory_limit" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Bridge/Doctrine/Tests/bootstrap.php b/src/Symfony/Bridge/Doctrine/Tests/bootstrap.php
deleted file mode 100644
index 7912352895..0000000000
--- a/src/Symfony/Bridge/Doctrine/Tests/bootstrap.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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.
- */
-
-$loader = require __DIR__.'/../vendor/autoload.php';
-
-Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 78fd037d25..52f702469b 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -20,6 +20,7 @@
         "doctrine/common": "~2.3"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/stopwatch": "~2.2|~3.0.0",
         "symfony/dependency-injection": "~2.2|~3.0.0",
         "symfony/form": "~2.7|~3.0.0",
diff --git a/src/Symfony/Bridge/Doctrine/phpunit.xml.dist b/src/Symfony/Bridge/Doctrine/phpunit.xml.dist
index 81fb10104a..5b576e52c9 100644
--- a/src/Symfony/Bridge/Doctrine/phpunit.xml.dist
+++ b/src/Symfony/Bridge/Doctrine/phpunit.xml.dist
@@ -4,12 +4,10 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="Tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
index 300768d5f6..bf81763b63 100644
--- a/src/Symfony/Bridge/Monolog/composer.json
+++ b/src/Symfony/Bridge/Monolog/composer.json
@@ -20,6 +20,7 @@
         "monolog/monolog": "~1.11"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/http-kernel": "~2.4|~3.0.0",
         "symfony/console": "~2.4|~3.0.0",
         "symfony/event-dispatcher": "~2.2|~3.0.0"
diff --git a/src/Symfony/Bridge/Monolog/phpunit.xml.dist b/src/Symfony/Bridge/Monolog/phpunit.xml.dist
index 35113fe376..34063ac548 100644
--- a/src/Symfony/Bridge/Monolog/phpunit.xml.dist
+++ b/src/Symfony/Bridge/Monolog/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Bridge/PhpUnit/.gitignore b/src/Symfony/Bridge/PhpUnit/.gitignore
new file mode 100644
index 0000000000..c49a5d8df5
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/autoload.php.dist b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
similarity index 52%
rename from autoload.php.dist
rename to src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
index 3b3297d924..7758209c3e 100644
--- a/autoload.php.dist
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -1,21 +1,26 @@
 <?php
 
-if (PHP_VERSION_ID >= 50400 && gc_enabled()) {
-    // Disabling Zend Garbage Collection to prevent segfaults with PHP5.4+
-    // https://bugs.php.net/bug.php?id=53976
-    gc_disable();
-}
+/*
+ * 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\Bridge\PhpUnit;
 
 /**
  * Catch deprecation notices and print a summary report at the end of the test suite
  *
- * @internal
+ * @author Nicolas Grekas <p@tchwork.com>
  */
 class DeprecationErrorHandler
 {
     private static $isRegistered = false;
 
-    public static function register()
+    public static function register($strict = false)
     {
         if (self::$isRegistered) {
             return;
@@ -28,9 +33,9 @@ class DeprecationErrorHandler
             'legacy' => array(),
             'other' => array(),
         );
-        $deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations) {
+        $deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations, $strict) {
             if (E_USER_DEPRECATED !== $type) {
-                return PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
+                return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
             }
 
             $trace = debug_backtrace(PHP_VERSION_ID >= 50400 ? DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT : true);
@@ -44,19 +49,38 @@ class DeprecationErrorHandler
                 $class = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
                 $method = $trace[$i]['function'];
 
-                $type = 0 === strpos($method, 'testLegacy') || 0 === strpos($method, 'provideLegacy') || 0 === strpos($method, 'getLegacy') || strpos($class, '\Legacy') ? 'legacy' : 'remaining';
+                $group = 0 === strpos($method, 'testLegacy') || 0 === strpos($method, 'provideLegacy') || 0 === strpos($method, 'getLegacy') || strpos($class, '\Legacy') || in_array('legacy', \PHPUnit_Util_Test::getGroups($class, $method), true) ? 'legacy' : 'remaining';
 
-                if ('legacy' === $type && 0 === (error_reporting() & E_USER_DEPRECATED)) {
-                    @++$deprecations[$type]['Silenced']['count'];
+                if ('legacy' === $group && 0 === (error_reporting() & E_USER_DEPRECATED)) {
+                    $ref =& $deprecations[$group]['Silenced']['count'];
+                    ++$ref;
                 } else {
-                    @++$deprecations[$type][$msg]['count'];
-                    @++$deprecations[$type][$msg][$class.'::'.$method];
+                    $ref =& $deprecations[$group][$msg]['count'];
+                    ++$ref;
+                    $ref =& $deprecations[$group][$msg][$class.'::'.$method];
+                    ++$ref;
                 }
             } else {
-                $type = 'other';
-                @++$deprecations[$type][$msg]['count'];
+                $group = 'other';
+                $ref =& $deprecations[$group][$msg]['count'];
+                ++$ref;
+            }
+            ++$deprecations[$group.'Count'];
+            unset($trace, $ref);
+
+            if ('legacy' !== $group) {
+                try {
+                    $e = $strict ? error_reporting(-1) : error_reporting();
+                    $result = \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
+                    error_reporting($e);
+                } catch (\Exception $x) {
+                    error_reporting($e);
+
+                    throw $x;
+                }
+
+                return $result;
             }
-            ++$deprecations[$type.'Count'];
         };
         $oldErrorHandler = set_error_handler($deprecationHandler);
 
@@ -68,20 +92,16 @@ class DeprecationErrorHandler
             }
         } else {
             self::$isRegistered = true;
-            register_shutdown_function(function () use (&$deprecations, $deprecationHandler) {
-
-                $colorize = new \SebastianBergmann\Environment\Console();
-
-                if ($colorize->hasColorSupport()) {
-                    $colorize = function ($str, $red) {
-                        $color = $red ? '41;37' : '43;30';
-
-                        return "\x1B[{$color}m{$str}\x1B[0m";
-                    };
-                } else {
-                    $colorize = function ($str) {return $str;};
-                }
+            if (self::hasColorSupport()) {
+                $colorize = function ($str, $red) {
+                    $color = $red ? '41;37' : '43;30';
 
+                    return "\x1B[{$color}m{$str}\x1B[0m";
+                };
+            } else {
+                $colorize = function ($str) {return $str;};
+            }
+            register_shutdown_function(function () use (&$deprecations, $deprecationHandler, $colorize) {
                 $currErrorHandler = set_error_handler('var_dump');
                 restore_error_handler();
 
@@ -93,13 +113,13 @@ class DeprecationErrorHandler
                     return $b['count'] - $a['count'];
                 };
 
-                foreach (array('remaining', 'legacy', 'other') as $type) {
-                    if ($deprecations[$type]) {
-                        echo "\n", $colorize(sprintf('%s deprecation notices (%d)', ucfirst($type), $deprecations[$type.'Count']), 'legacy' !== $type), "\n";
+                foreach (array('remaining', 'legacy', 'other') as $group) {
+                    if ($deprecations[$group]) {
+                        echo "\n", $colorize(sprintf('%s deprecation notices (%d)', ucfirst($group), $deprecations[$group.'Count']), 'legacy' !== $group), "\n";
 
-                        uasort($deprecations[$type], $cmp);
+                        uasort($deprecations[$group], $cmp);
 
-                        foreach ($deprecations[$type] as $msg => $notices) {
+                        foreach ($deprecations[$group] as $msg => $notices) {
                             echo "\n", $msg, ': ', $notices['count'], "x\n";
 
                             arsort($notices);
@@ -118,16 +138,13 @@ class DeprecationErrorHandler
             });
         }
     }
+
+    private static function hasColorSupport()
+    {
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
+        }
+
+        return defined('STDOUT') && function_exists('posix_isatty') && @posix_isatty(STDOUT);
+    }
 }
-
-if (class_exists('PHPUnit_Util_ErrorHandler')) {
-    DeprecationErrorHandler::register();
-}
-
-$loader = require_once __DIR__.'/vendor/autoload.php';
-
-use Doctrine\Common\Annotations\AnnotationRegistry;
-
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
-
-return $loader;
diff --git a/src/Symfony/Bridge/PhpUnit/LICENSE b/src/Symfony/Bridge/PhpUnit/LICENSE
new file mode 100644
index 0000000000..ef1cde91a6
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2014-2015 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Bridge/PhpUnit/README.md b/src/Symfony/Bridge/PhpUnit/README.md
new file mode 100644
index 0000000000..4e8db55d56
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/README.md
@@ -0,0 +1,62 @@
+PHPUnit Bridge
+==============
+
+Provides utilities for PHPUnit, especially user deprecation notices management.
+
+It comes with the following features:
+
+ * disable the garbage collector;
+ * auto-register `class_exists` to load Doctrine annotations;
+ * print a user deprecation notices summary at the end of the test suite.
+
+Handling user deprecation notices is sensitive to the SYMFONY_DEPRECATIONS_HELPER
+environment variable. This env var configures 3 behaviors depending on its value:
+
+ * when set to `strict`, all but legacy-tagged deprecation notices will make tests
+   fail. This is the recommended mode for best forward compatibility.
+ * `weak` on the contrary will make tests ignore all deprecation notices.
+   This is the recommended mode for legacy projects that must use deprecated
+   interfaces for backward compatibility reasons.
+ * any other value will respect the current error reporting level.
+
+All three modes will display a summary of deprecation notices at the end of the
+test suite, split in two groups:
+
+ * **Legacy** deprecation notices denote tests that explicitly test some legacy
+   interfaces. In all 3 modes, deprecation notices triggered in a legacy-tagged
+   test do never make a test fail. There are four ways to mark a test as legacy:
+    - make its class start with the `Legacy` prefix;
+    - make its method start with `testLegacy`;
+    - make its data provider start with `provideLegacy` or `getLegacy`;
+    - add the `@group legacy` annotation to its class or method.
+ * **Remaining/Other** deprecation notices are all other (non-legacy)
+   notices, grouped by message, test class and method.
+
+Usage
+-----
+
+Add this bridge to the `require-dev` section of your composer.json file
+(not in `require`) with e.g.
+`composer require --dev "symfony/phpunit-bridge"`.
+
+When running `phpunit`, you will see a summary of deprecation notices at the end
+of the test suite.
+
+Deprecation notices in the **Remaining/Other** section need some thought.
+You have to decide either to:
+
+ * update your code to not use deprecated interfaces anymore, thus gaining better
+   forward compatibility;
+ * or move them to the **Legacy** section (by using one of the above way).
+
+After reviewing them, you should silence deprecations in the **Legacy** section
+if you think they are triggered by tests dedicated to testing deprecated
+interfaces. To do so, add the following line at the beginning of your legacy
+test case or in the `setUp()` method of your legacy test class:
+`$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
+
+Last but not least, you should then configure your C.I. to the reporting mode
+that is appropriated to your project by setting SYMFONY_DEPRECATIONS_HELPER to
+`strict`, `weak` or empty. It is recommended to start with `weak` mode, upgrade
+your code as described above, then when the *Remaining/Other* sections are empty,
+move to `strict` to keep forward compatibility on the long run.
diff --git a/src/Symfony/Bridge/PhpUnit/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php
new file mode 100644
index 0000000000..6bd37ddde2
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/bootstrap.php
@@ -0,0 +1,31 @@
+<?php
+
+use Doctrine\Common\Annotations\AnnotationRegistry;
+use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
+
+if (!class_exists('PHPUnit_Util_ErrorHandler')) {
+    return;
+}
+
+if (PHP_VERSION_ID >= 50400 && gc_enabled()) {
+    // Disabling Zend Garbage Collection to prevent segfaults with PHP5.4+
+    // https://bugs.php.net/bug.php?id=53976
+    gc_disable();
+}
+
+if (class_exists('Doctrine\Common\Annotations\AnnotationRegistry')) {
+    AnnotationRegistry::registerLoader('class_exists');
+}
+
+switch (getenv('SYMFONY_DEPRECATIONS_HELPER')) {
+    case 'strict':
+        DeprecationErrorHandler::register(true);
+        break;
+
+    case 'weak':
+        error_reporting(error_reporting() & ~E_USER_DEPRECATED);
+        // No break;
+    default:
+        DeprecationErrorHandler::register(false);
+        break;
+}
diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
new file mode 100644
index 0000000000..01fe791ac4
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -0,0 +1,32 @@
+{
+    "name": "symfony/phpunit-bridge",
+    "type": "symfony-bridge",
+    "description": "Symfony PHPUnit Bridge",
+    "keywords": [],
+    "homepage": "http://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "http://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.9"
+    },
+    "autoload": {
+        "files": [ "bootstrap.php" ],
+        "psr-0": { "Symfony\\Bridge\\PhpUnit\\": "" }
+    },
+    "target-dir": "Symfony/Bridge/PhpUnit",
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.7-dev"
+        }
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/phpunit.xml.dist b/src/Symfony/Bridge/PhpUnit/phpunit.xml.dist
new file mode 100644
index 0000000000..7f631b2ece
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/phpunit.xml.dist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony PHPUnit Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
index 70a8d0912b..123b93b03e 100644
--- a/src/Symfony/Bridge/ProxyManager/composer.json
+++ b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -21,6 +21,7 @@
         "ocramius/proxy-manager": "~0.4|~1.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/config": "~2.3|~3.0.0"
     },
     "autoload": {
diff --git a/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist b/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist
index 8d0294c6eb..60980be9e5 100644
--- a/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist
+++ b/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Bridge/Swiftmailer/composer.json b/src/Symfony/Bridge/Swiftmailer/composer.json
index 99ae9a7be8..49ef1f5723 100644
--- a/src/Symfony/Bridge/Swiftmailer/composer.json
+++ b/src/Symfony/Bridge/Swiftmailer/composer.json
@@ -19,6 +19,9 @@
         "php": ">=5.3.9",
         "swiftmailer/swiftmailer": ">=4.2.0,<6.0-dev"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "suggest": {
         "symfony/http-kernel": ""
     },
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index 8e5dfe46ae..09855bd162 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -20,6 +20,7 @@
         "twig/twig": "~1.18"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/finder": "~2.3|~3.0.0",
         "symfony/form": "~2.6|~3.0.0",
         "symfony/http-kernel": "~2.3|~3.0.0",
diff --git a/src/Symfony/Bridge/Twig/phpunit.xml.dist b/src/Symfony/Bridge/Twig/phpunit.xml.dist
index cf2e90264b..10c0be1142 100644
--- a/src/Symfony/Bridge/Twig/phpunit.xml.dist
+++ b/src/Symfony/Bridge/Twig/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json
index 33c05e58e0..3e669094c2 100644
--- a/src/Symfony/Bundle/DebugBundle/composer.json
+++ b/src/Symfony/Bundle/DebugBundle/composer.json
@@ -22,6 +22,7 @@
         "symfony/var-dumper": "~2.6|~3.0.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/config": "~2.3|~3.0.0",
         "symfony/dependency-injection": "~2.3|~3.0.0"
     },
diff --git a/src/Symfony/Bundle/DebugBundle/phpunit.xml.dist b/src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
index 8eb57b64ea..cbde5628a3 100644
--- a/src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
+++ b/src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-    <!-- Disable E_USER_DEPRECATED until 3.0 -->
-    <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 485051c4cd..15fed5abbd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -33,6 +33,7 @@
         "doctrine/annotations": "~1.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/asset": "~2.7|~3.0.0",
         "symfony/browser-kit": "~2.4|~3.0.0",
         "symfony/console": "~2.6|~3.0.0",
diff --git a/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist b/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist
index 22ffb9c1e5..269adda917 100644
--- a/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist
+++ b/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
index cc21852e21..6b4552627a 100644
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -21,6 +21,7 @@
         "symfony/http-kernel": "~2.2|~3.0.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/browser-kit": "~2.4|~3.0.0",
         "symfony/console": "~2.3|~3.0.0",
         "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
diff --git a/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist b/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist
index 231b22d8bf..0ff2b570e2 100644
--- a/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist
+++ b/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
index 975cee73ce..8bbef5a939 100644
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -23,6 +23,7 @@
         "symfony/http-kernel": "~2.7|~3.0.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/stopwatch": "~2.2|~3.0.0",
         "symfony/dependency-injection": "~2.2|~3.0.0",
         "symfony/expression-language": "~2.4|~3.0.0",
diff --git a/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist b/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist
index 94a8bbd399..763b8b68bf 100644
--- a/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist
+++ b/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
index 5c2051d430..2af5c45d1d 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -22,6 +22,7 @@
         "symfony/twig-bridge": "~2.7|~3.0.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/config": "~2.2|~3.0.0",
         "symfony/console": "~2.3|~3.0.0",
         "symfony/dependency-injection": "~2.2|~3.0.0",
diff --git a/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist b/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist
index 0056f47b84..f449adf319 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist
+++ b/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Asset/composer.json b/src/Symfony/Component/Asset/composer.json
index cf058bb3b2..177a12970a 100644
--- a/src/Symfony/Component/Asset/composer.json
+++ b/src/Symfony/Component/Asset/composer.json
@@ -22,6 +22,7 @@
         "symfony/http-foundation": ""
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/http-foundation": "~2.4"
     },
     "autoload": {
diff --git a/src/Symfony/Component/Asset/phpunit.xml.dist b/src/Symfony/Component/Asset/phpunit.xml.dist
index 547ecdaa7a..3e53da45d9 100644
--- a/src/Symfony/Component/Asset/phpunit.xml.dist
+++ b/src/Symfony/Component/Asset/phpunit.xml.dist
@@ -6,6 +6,10 @@
          colors="true"
          bootstrap="vendor/autoload.php"
 >
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
     <testsuites>
         <testsuite name="Symfony Asset Component Test Suite">
             <directory>./Tests/</directory>
diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json
index b59321d592..cbfc5a681d 100644
--- a/src/Symfony/Component/BrowserKit/composer.json
+++ b/src/Symfony/Component/BrowserKit/composer.json
@@ -20,6 +20,7 @@
         "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/process": "~2.0,>=2.0.5|~3.0.0",
         "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0"
     },
diff --git a/src/Symfony/Component/BrowserKit/phpunit.xml.dist b/src/Symfony/Component/BrowserKit/phpunit.xml.dist
index fe2aa44e99..d76b2b98af 100644
--- a/src/Symfony/Component/BrowserKit/phpunit.xml.dist
+++ b/src/Symfony/Component/BrowserKit/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json
index 66ce112274..409435c7a1 100644
--- a/src/Symfony/Component/ClassLoader/composer.json
+++ b/src/Symfony/Component/ClassLoader/composer.json
@@ -20,6 +20,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/finder": "~2.0,>=2.0.5|~3.0.0"
     },
     "autoload": {
diff --git a/src/Symfony/Component/ClassLoader/phpunit.xml.dist b/src/Symfony/Component/ClassLoader/phpunit.xml.dist
index 4228f7681e..4856db5be6 100644
--- a/src/Symfony/Component/ClassLoader/phpunit.xml.dist
+++ b/src/Symfony/Component/ClassLoader/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json
index aedf7235ef..8ba3609687 100644
--- a/src/Symfony/Component/Config/composer.json
+++ b/src/Symfony/Component/Config/composer.json
@@ -19,6 +19,9 @@
         "php": ">=5.3.9",
         "symfony/filesystem": "~2.3|~3.0.0"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Component\\Config\\": "" }
     },
diff --git a/src/Symfony/Component/Config/phpunit.xml.dist b/src/Symfony/Component/Config/phpunit.xml.dist
index 326db41077..3fe6fd87c8 100644
--- a/src/Symfony/Component/Config/phpunit.xml.dist
+++ b/src/Symfony/Component/Config/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
index 86e5a471bc..f11d243b0a 100644
--- a/src/Symfony/Component/Console/composer.json
+++ b/src/Symfony/Component/Console/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/event-dispatcher": "~2.1|~3.0.0",
         "symfony/process": "~2.1|~3.0.0",
         "psr/log": "~1.0"
diff --git a/src/Symfony/Component/Console/phpunit.xml.dist b/src/Symfony/Component/Console/phpunit.xml.dist
index 908e0aac7f..ae0dcbeaba 100644
--- a/src/Symfony/Component/Console/phpunit.xml.dist
+++ b/src/Symfony/Component/Console/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/CssSelector/composer.json b/src/Symfony/Component/CssSelector/composer.json
index dd60194f72..004c378aaa 100644
--- a/src/Symfony/Component/CssSelector/composer.json
+++ b/src/Symfony/Component/CssSelector/composer.json
@@ -22,6 +22,9 @@
     "require": {
         "php": ">=5.3.9"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Component\\CssSelector\\": "" }
     },
diff --git a/src/Symfony/Component/CssSelector/phpunit.xml.dist b/src/Symfony/Component/CssSelector/phpunit.xml.dist
index 974af3ff02..14a320c873 100644
--- a/src/Symfony/Component/CssSelector/phpunit.xml.dist
+++ b/src/Symfony/Component/CssSelector/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json
index 42dc36518d..dc94bac715 100644
--- a/src/Symfony/Component/Debug/composer.json
+++ b/src/Symfony/Component/Debug/composer.json
@@ -23,6 +23,7 @@
         "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/class-loader": "~2.2|~3.0.0",
         "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0",
         "symfony/http-foundation": "~2.1|~3.0.0"
diff --git a/src/Symfony/Component/Debug/phpunit.xml.dist b/src/Symfony/Component/Debug/phpunit.xml.dist
index 82d69681dc..20b0313f0c 100644
--- a/src/Symfony/Component/Debug/phpunit.xml.dist
+++ b/src/Symfony/Component/Debug/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index 6ee96fa1f7..615e7b30d1 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/yaml": "~2.1|~3.0.0",
         "symfony/config": "~2.2|~3.0.0",
         "symfony/expression-language": "~2.6|~3.0.0"
diff --git a/src/Symfony/Component/DependencyInjection/phpunit.xml.dist b/src/Symfony/Component/DependencyInjection/phpunit.xml.dist
index b5b3ed2ea8..86252d0456 100644
--- a/src/Symfony/Component/DependencyInjection/phpunit.xml.dist
+++ b/src/Symfony/Component/DependencyInjection/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json
index 4fdebe9124..3390cbfa15 100644
--- a/src/Symfony/Component/DomCrawler/composer.json
+++ b/src/Symfony/Component/DomCrawler/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/css-selector": "~2.3|~3.0.0"
     },
     "suggest": {
diff --git a/src/Symfony/Component/DomCrawler/phpunit.xml.dist b/src/Symfony/Component/DomCrawler/phpunit.xml.dist
index c099dac312..d15dd6a48e 100644
--- a/src/Symfony/Component/DomCrawler/phpunit.xml.dist
+++ b/src/Symfony/Component/DomCrawler/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json
index 3058344057..9b762b90fc 100644
--- a/src/Symfony/Component/EventDispatcher/composer.json
+++ b/src/Symfony/Component/EventDispatcher/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/dependency-injection": "~2.6|~3.0.0",
         "symfony/expression-language": "~2.6|~3.0.0",
         "symfony/config": "~2.0,>=2.0.5|~3.0.0",
diff --git a/src/Symfony/Component/EventDispatcher/phpunit.xml.dist b/src/Symfony/Component/EventDispatcher/phpunit.xml.dist
index a710ca311c..ae0586e0b3 100644
--- a/src/Symfony/Component/EventDispatcher/phpunit.xml.dist
+++ b/src/Symfony/Component/EventDispatcher/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/ExpressionLanguage/composer.json b/src/Symfony/Component/ExpressionLanguage/composer.json
index 7dcd64a295..98e51310c2 100644
--- a/src/Symfony/Component/ExpressionLanguage/composer.json
+++ b/src/Symfony/Component/ExpressionLanguage/composer.json
@@ -18,6 +18,9 @@
     "require": {
         "php": ">=5.3.9"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Component\\ExpressionLanguage\\": "" }
     },
diff --git a/src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist b/src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist
index 641e0d4944..183770651e 100644
--- a/src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist
+++ b/src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist
@@ -12,9 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Filesystem/composer.json b/src/Symfony/Component/Filesystem/composer.json
index 8cb835367a..5df8ae7d03 100644
--- a/src/Symfony/Component/Filesystem/composer.json
+++ b/src/Symfony/Component/Filesystem/composer.json
@@ -18,6 +18,9 @@
     "require": {
         "php": ">=5.3.9"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Component\\Filesystem\\": "" }
     },
diff --git a/src/Symfony/Component/Filesystem/phpunit.xml.dist b/src/Symfony/Component/Filesystem/phpunit.xml.dist
index cd8054f735..7c6ba7aba3 100644
--- a/src/Symfony/Component/Filesystem/phpunit.xml.dist
+++ b/src/Symfony/Component/Filesystem/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Finder/composer.json b/src/Symfony/Component/Finder/composer.json
index 6ea180275f..c38df483ee 100644
--- a/src/Symfony/Component/Finder/composer.json
+++ b/src/Symfony/Component/Finder/composer.json
@@ -18,6 +18,9 @@
     "require": {
         "php": ">=5.3.9"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Component\\Finder\\": "" }
     },
diff --git a/src/Symfony/Component/Finder/phpunit.xml.dist b/src/Symfony/Component/Finder/phpunit.xml.dist
index a6ede9df13..631e570b94 100644
--- a/src/Symfony/Component/Finder/phpunit.xml.dist
+++ b/src/Symfony/Component/Finder/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
index f62dc5c62e..0cf916c442 100644
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@@ -23,6 +23,7 @@
         "symfony/property-access": "~2.3|~3.0.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "doctrine/collections": "~1.0",
         "symfony/validator": "~2.6|~3.0.0",
         "symfony/http-foundation": "~2.2|~3.0.0",
diff --git a/src/Symfony/Component/Form/phpunit.xml.dist b/src/Symfony/Component/Form/phpunit.xml.dist
index 09189b0eff..fd668a9e8b 100644
--- a/src/Symfony/Component/Form/phpunit.xml.dist
+++ b/src/Symfony/Component/Form/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
index 3e8b009db7..dd25e4b807 100644
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/expression-language": "~2.4|~3.0.0"
     },
     "autoload": {
diff --git a/src/Symfony/Component/HttpFoundation/phpunit.xml.dist b/src/Symfony/Component/HttpFoundation/phpunit.xml.dist
index 3d675609db..9ffdb43a2d 100644
--- a/src/Symfony/Component/HttpFoundation/phpunit.xml.dist
+++ b/src/Symfony/Component/HttpFoundation/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index de1e9d2277..67850e8362 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -23,6 +23,7 @@
         "psr/log": "~1.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/browser-kit": "~2.3|~3.0.0",
         "symfony/class-loader": "~2.1|~3.0.0",
         "symfony/config": "~2.0,>=2.0.5|~3.0.0",
diff --git a/src/Symfony/Component/HttpKernel/phpunit.xml.dist b/src/Symfony/Component/HttpKernel/phpunit.xml.dist
index c6ddea4f67..13149663e4 100644
--- a/src/Symfony/Component/HttpKernel/phpunit.xml.dist
+++ b/src/Symfony/Component/HttpKernel/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Intl/composer.json b/src/Symfony/Component/Intl/composer.json
index 609e871f91..e73247864f 100644
--- a/src/Symfony/Component/Intl/composer.json
+++ b/src/Symfony/Component/Intl/composer.json
@@ -27,6 +27,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/filesystem": "~2.1|~3.0.0"
     },
     "suggest": {
diff --git a/src/Symfony/Component/Intl/phpunit.xml.dist b/src/Symfony/Component/Intl/phpunit.xml.dist
index 007d574e85..e42226a1b1 100644
--- a/src/Symfony/Component/Intl/phpunit.xml.dist
+++ b/src/Symfony/Component/Intl/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Locale/composer.json b/src/Symfony/Component/Locale/composer.json
index 1b5937ac38..3adf477b2f 100644
--- a/src/Symfony/Component/Locale/composer.json
+++ b/src/Symfony/Component/Locale/composer.json
@@ -19,6 +19,9 @@
         "php": ">=5.3.9",
         "symfony/intl": "~2.3|~3.0.0"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Component\\Locale\\": "" }
     },
diff --git a/src/Symfony/Component/Locale/phpunit.xml.dist b/src/Symfony/Component/Locale/phpunit.xml.dist
index 24dd5d8028..0d9b637cc7 100644
--- a/src/Symfony/Component/Locale/phpunit.xml.dist
+++ b/src/Symfony/Component/Locale/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/OptionsResolver/composer.json b/src/Symfony/Component/OptionsResolver/composer.json
index 8720f2b789..51c68a3bad 100644
--- a/src/Symfony/Component/OptionsResolver/composer.json
+++ b/src/Symfony/Component/OptionsResolver/composer.json
@@ -18,6 +18,9 @@
     "require": {
         "php": ">=5.3.9"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Component\\OptionsResolver\\": "" }
     },
diff --git a/src/Symfony/Component/OptionsResolver/phpunit.xml.dist b/src/Symfony/Component/OptionsResolver/phpunit.xml.dist
index 43fb0345e3..5a2316a1c9 100644
--- a/src/Symfony/Component/OptionsResolver/phpunit.xml.dist
+++ b/src/Symfony/Component/OptionsResolver/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Process/composer.json b/src/Symfony/Component/Process/composer.json
index 3c47418ead..e6b1a6e4ea 100644
--- a/src/Symfony/Component/Process/composer.json
+++ b/src/Symfony/Component/Process/composer.json
@@ -18,6 +18,9 @@
     "require": {
         "php": ">=5.3.9"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Component\\Process\\": "" }
     },
diff --git a/src/Symfony/Component/Process/phpunit.xml.dist b/src/Symfony/Component/Process/phpunit.xml.dist
index a7f26b3621..b5d605c2ef 100644
--- a/src/Symfony/Component/Process/phpunit.xml.dist
+++ b/src/Symfony/Component/Process/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json
index 12ff7dd89a..5110239dbb 100644
--- a/src/Symfony/Component/PropertyAccess/composer.json
+++ b/src/Symfony/Component/PropertyAccess/composer.json
@@ -18,6 +18,9 @@
     "require": {
         "php": ">=5.3.9"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Component\\PropertyAccess\\": "" }
     },
diff --git a/src/Symfony/Component/PropertyAccess/phpunit.xml.dist b/src/Symfony/Component/PropertyAccess/phpunit.xml.dist
index d4a0e024cc..fcf5f6ae56 100644
--- a/src/Symfony/Component/PropertyAccess/phpunit.xml.dist
+++ b/src/Symfony/Component/PropertyAccess/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json
index ff7944ef1e..252f2bc0e7 100644
--- a/src/Symfony/Component/Routing/composer.json
+++ b/src/Symfony/Component/Routing/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/config": "~2.2|~3.0.0",
         "symfony/http-foundation": "~2.3|~3.0.0",
         "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
diff --git a/src/Symfony/Component/Routing/phpunit.xml.dist b/src/Symfony/Component/Routing/phpunit.xml.dist
index 4e2594d838..a9083088a9 100644
--- a/src/Symfony/Component/Routing/phpunit.xml.dist
+++ b/src/Symfony/Component/Routing/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Security/Acl/composer.json b/src/Symfony/Component/Security/Acl/composer.json
index 4325d8c0e5..2c0401fb29 100644
--- a/src/Symfony/Component/Security/Acl/composer.json
+++ b/src/Symfony/Component/Security/Acl/composer.json
@@ -20,6 +20,7 @@
         "symfony/security-core": "~2.4|~3.0.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "doctrine/common": "~2.2",
         "doctrine/dbal": "~2.2",
         "psr/log": "~1.0"
diff --git a/src/Symfony/Component/Security/Acl/phpunit.xml.dist b/src/Symfony/Component/Security/Acl/phpunit.xml.dist
index 20d1b803b9..7552339575 100644
--- a/src/Symfony/Component/Security/Acl/phpunit.xml.dist
+++ b/src/Symfony/Component/Security/Acl/phpunit.xml.dist
@@ -12,9 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
index 4541f41544..f5e317902b 100644
--- a/src/Symfony/Component/Security/Core/composer.json
+++ b/src/Symfony/Component/Security/Core/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/event-dispatcher": "~2.1|~3.0.0",
         "symfony/expression-language": "~2.6|~3.0.0",
         "symfony/http-foundation": "~2.4|~3.0.0",
diff --git a/src/Symfony/Component/Security/Core/phpunit.xml.dist b/src/Symfony/Component/Security/Core/phpunit.xml.dist
index 7a5f7da956..8a1a2914b0 100644
--- a/src/Symfony/Component/Security/Core/phpunit.xml.dist
+++ b/src/Symfony/Component/Security/Core/phpunit.xml.dist
@@ -12,9 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Security/Csrf/composer.json b/src/Symfony/Component/Security/Csrf/composer.json
index 7fd71af498..4d4ff6a942 100644
--- a/src/Symfony/Component/Security/Csrf/composer.json
+++ b/src/Symfony/Component/Security/Csrf/composer.json
@@ -20,6 +20,7 @@
         "symfony/security-core": "~2.4|~3.0.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/http-foundation": "~2.1|~3.0.0"
     },
     "suggest": {
diff --git a/src/Symfony/Component/Security/Csrf/phpunit.xml.dist b/src/Symfony/Component/Security/Csrf/phpunit.xml.dist
index f6e9005bdb..8f950a3d3d 100644
--- a/src/Symfony/Component/Security/Csrf/phpunit.xml.dist
+++ b/src/Symfony/Component/Security/Csrf/phpunit.xml.dist
@@ -12,9 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
index 007ae75fed..80a038708d 100644
--- a/src/Symfony/Component/Security/Http/composer.json
+++ b/src/Symfony/Component/Security/Http/composer.json
@@ -23,6 +23,7 @@
         "symfony/http-kernel": "~2.4|~3.0.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/routing": "~2.2|~3.0.0",
         "symfony/security-csrf": "~2.4|~3.0.0",
         "psr/log": "~1.0"
diff --git a/src/Symfony/Component/Security/Http/phpunit.xml.dist b/src/Symfony/Component/Security/Http/phpunit.xml.dist
index 58fe58e132..49b36f2718 100644
--- a/src/Symfony/Component/Security/Http/phpunit.xml.dist
+++ b/src/Symfony/Component/Security/Http/phpunit.xml.dist
@@ -12,9 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
index 946cb72c0a..af7fad74f0 100644
--- a/src/Symfony/Component/Security/composer.json
+++ b/src/Symfony/Component/Security/composer.json
@@ -28,6 +28,7 @@
         "symfony/security-http": "self.version"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/intl": "~2.3|~3.0.0",
         "symfony/routing": "~2.2|~3.0.0",
         "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
diff --git a/src/Symfony/Component/Security/phpunit.xml.dist b/src/Symfony/Component/Security/phpunit.xml.dist
index 7cbf08aed8..7747b371c1 100644
--- a/src/Symfony/Component/Security/phpunit.xml.dist
+++ b/src/Symfony/Component/Security/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Serializer/Tests/bootstrap.php b/src/Symfony/Component/Serializer/Tests/bootstrap.php
deleted file mode 100644
index 20ee9d793a..0000000000
--- a/src/Symfony/Component/Serializer/Tests/bootstrap.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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.
- */
-
-$loader = require __DIR__.'/../vendor/autoload.php';
-
-Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(function ($class) { return class_exists($class); });
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
index b0364eb21c..cffa235e03 100644
--- a/src/Symfony/Component/Serializer/composer.json
+++ b/src/Symfony/Component/Serializer/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/yaml": "~2.0|~3.0.0",
         "symfony/config": "~2.2|~3.0.0",
         "doctrine/annotations": "~1.0",
diff --git a/src/Symfony/Component/Serializer/phpunit.xml.dist b/src/Symfony/Component/Serializer/phpunit.xml.dist
index 308efc737e..279e1eb3aa 100644
--- a/src/Symfony/Component/Serializer/phpunit.xml.dist
+++ b/src/Symfony/Component/Serializer/phpunit.xml.dist
@@ -4,12 +4,10 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="Tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Stopwatch/composer.json b/src/Symfony/Component/Stopwatch/composer.json
index c3ddedea8c..95416bf0ad 100644
--- a/src/Symfony/Component/Stopwatch/composer.json
+++ b/src/Symfony/Component/Stopwatch/composer.json
@@ -18,6 +18,9 @@
     "require": {
         "php": ">=5.3.9"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Component\\Stopwatch\\": "" }
     },
diff --git a/src/Symfony/Component/Stopwatch/phpunit.xml.dist b/src/Symfony/Component/Stopwatch/phpunit.xml.dist
index 24e7e4101b..b16dcaebf9 100644
--- a/src/Symfony/Component/Stopwatch/phpunit.xml.dist
+++ b/src/Symfony/Component/Stopwatch/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Templating/composer.json b/src/Symfony/Component/Templating/composer.json
index c8d78588ab..45b7a2d1b1 100644
--- a/src/Symfony/Component/Templating/composer.json
+++ b/src/Symfony/Component/Templating/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "psr/log": "~1.0"
     },
     "suggest": {
diff --git a/src/Symfony/Component/Templating/phpunit.xml.dist b/src/Symfony/Component/Templating/phpunit.xml.dist
index 34ca2f2943..3da1f5de13 100644
--- a/src/Symfony/Component/Templating/phpunit.xml.dist
+++ b/src/Symfony/Component/Templating/phpunit.xml.dist
@@ -7,10 +7,9 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
+
     <testsuites>
         <testsuite name="Symfony Templating Component Test Suite">
             <directory>./Tests/</directory>
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
index e891028e32..50f76efaeb 100644
--- a/src/Symfony/Component/Translation/composer.json
+++ b/src/Symfony/Component/Translation/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/config": "~2.3,>=2.3.12|~3.0.0",
         "symfony/intl": "~2.3|~3.0.0",
         "symfony/yaml": "~2.2|~3.0.0",
diff --git a/src/Symfony/Component/Translation/phpunit.xml.dist b/src/Symfony/Component/Translation/phpunit.xml.dist
index c0777909d2..16cca4afb7 100644
--- a/src/Symfony/Component/Translation/phpunit.xml.dist
+++ b/src/Symfony/Component/Translation/phpunit.xml.dist
@@ -7,10 +7,9 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
+
     <testsuites>
         <testsuite name="Symfony Translation Component Test Suite">
             <directory>./Tests/</directory>
diff --git a/src/Symfony/Component/Validator/Tests/bootstrap.php b/src/Symfony/Component/Validator/Tests/bootstrap.php
deleted file mode 100644
index 8977ca9e86..0000000000
--- a/src/Symfony/Component/Validator/Tests/bootstrap.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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.
- */
-
-$loader = require __DIR__.'/../vendor/autoload.php';
-
-Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(function ($class) {return class_exists($class);});
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index 43579b075e..82899712b4 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -20,6 +20,7 @@
         "symfony/translation": "~2.4|~3.0.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/http-foundation": "~2.1|~3.0.0",
         "symfony/intl": "~2.3|~3.0.0",
         "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
diff --git a/src/Symfony/Component/Validator/phpunit.xml.dist b/src/Symfony/Component/Validator/phpunit.xml.dist
index e10097795d..1bf4391c3c 100644
--- a/src/Symfony/Component/Validator/phpunit.xml.dist
+++ b/src/Symfony/Component/Validator/phpunit.xml.dist
@@ -4,13 +4,12 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="Tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
+
     <testsuites>
         <testsuite name="Symfony Validator Component Test Suite">
             <directory>./Tests/</directory>
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json
index aa12e24f55..0b59b5d67a 100644
--- a/src/Symfony/Component/VarDumper/composer.json
+++ b/src/Symfony/Component/VarDumper/composer.json
@@ -18,6 +18,9 @@
     "require": {
         "php": ">=5.3.9"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "suggest": {
         "ext-symfony_debug": ""
     },
diff --git a/src/Symfony/Component/VarDumper/phpunit.xml.dist b/src/Symfony/Component/VarDumper/phpunit.xml.dist
index ee3d4c2fe3..05128b9fa1 100644
--- a/src/Symfony/Component/VarDumper/phpunit.xml.dist
+++ b/src/Symfony/Component/VarDumper/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json
index 27c9be195e..bc3ffa021a 100644
--- a/src/Symfony/Component/Yaml/composer.json
+++ b/src/Symfony/Component/Yaml/composer.json
@@ -18,6 +18,9 @@
     "require": {
         "php": ">=5.3.9"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Component\\Yaml\\": "" }
     },
diff --git a/src/Symfony/Component/Yaml/phpunit.xml.dist b/src/Symfony/Component/Yaml/phpunit.xml.dist
index 2d11e6fc2c..418b2c6c9a 100644
--- a/src/Symfony/Component/Yaml/phpunit.xml.dist
+++ b/src/Symfony/Component/Yaml/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>