diff --git a/composer.lock b/composer.lock
index 832979f..76769a6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4199,11 +4199,71 @@
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
             "time": "2015-10-11 09:39:48"
+        },
+        {
+            "name": "symfony/phpunit-bridge",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/phpunit-bridge.git",
+                "reference": "d5ab07f582cb6cea85100f8d2df022f901415cd0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/d5ab07f582cb6cea85100f8d2df022f901415cd0",
+                "reference": "d5ab07f582cb6cea85100f8d2df022f901415cd0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
+            },
+            "bin": [
+                "bin/simple-phpunit"
+            ],
+            "type": "symfony-bridge",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Bridge\\PhpUnit\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony PHPUnit Bridge",
+            "homepage": "https://symfony.com",
+            "time": "2016-09-24 08:11:35"
         }
     ],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {
+        "symfony/phpunit-bridge": 20
+    },
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
diff --git a/core/composer.json b/core/composer.json
index 53ab8fa..1258445 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -41,7 +41,8 @@
         "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
         "mikey179/vfsStream": "~1.2",
         "phpunit/phpunit": "~4.8",
-        "symfony/css-selector": "~2.8"
+        "symfony/css-selector": "~2.8",
+        "symfony/phpunit-bridge": "3.2.x-dev"
     },
     "replace": {
         "drupal/action": "self.version",
diff --git a/core/phpunit.xml.dist b/core/phpunit.xml.dist
index 9658f2c..848b05c 100644
--- a/core/phpunit.xml.dist
+++ b/core/phpunit.xml.dist
@@ -45,6 +45,8 @@
     </testsuite>
   </testsuites>
   <listeners>
+    <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
+    </listener>
     <listener class="\Drupal\Tests\Listeners\DrupalStandardsListener">
     </listener>
   </listeners>
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
index 3c89804..5c22f07 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
@@ -674,6 +674,8 @@ public function testInitializedForAliases() {
    * @expectedException \BadMethodCallException
    *
    * @dataProvider scopeExceptionTestProvider
+   *
+   * @group legacy
    */
   public function testScopeFunctionsWithException($method, $argument) {
     $callable = array(
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
index 49b6556..04139d3 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
@@ -208,6 +208,8 @@ public function getParametersDataProvider() {
      * @covers ::getParameterCall
      *
      * @dataProvider getDefinitionsDataProvider
+     *
+     * @group legacy
      */
     public function testGetServiceDefinitions($services, $definition_services) {
       $this->containerDefinition['services'] = $definition_services;
@@ -483,6 +485,8 @@ protected function getServiceCall($id, $invalid_behavior = ContainerInterface::E
      * @covers ::getServiceDefinition
      *
      * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     *
+     * @group legacy
      */
     public function testGetServiceDefinitionWithInvalidScope() {
       $bar_definition = new Definition('\stdClass');
@@ -499,6 +503,8 @@ public function testGetServiceDefinitionWithInvalidScope() {
      * @covers ::getReferenceCall
      *
      * @dataProvider publicPrivateDataProvider
+     *
+     * @group legacy
      */
     public function testGetServiceDefinitionWithReferenceToAlias($public) {
       $bar_definition = new Definition('\stdClass');
@@ -556,6 +562,8 @@ public function publicPrivateDataProvider() {
      * @covers ::getServiceDefinition
      *
      * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     *
+     * @group legacy
      */
     public function testGetServiceDefinitionForDecoratedService() {
       $bar_definition = new Definition('\stdClass');
diff --git a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
index 09ec989..bbee477 100644
--- a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
@@ -261,6 +261,8 @@ public function testChainAddRemoveClasses() {
    *
    * @covers ::removeClass
    * @covers ::addClass
+   *
+   * @group legacy
    */
   public function testTwigAddRemoveClasses($template, $expected, $seed_attributes = array()) {
     $loader = new \Twig_Loader_String();
diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
index ea93703..6a59868 100644
--- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
@@ -30,6 +30,8 @@ class TwigExtensionTest extends UnitTestCase {
    * Tests the escaping
    *
    * @dataProvider providerTestEscaping
+   *
+   * @group legacy
    */
   public function testEscaping($template, $expected) {
     $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
@@ -81,6 +83,8 @@ public function providerTestEscaping() {
 
   /**
    * Tests the active_theme function.
+   *
+   * @group legacy
    */
   public function testActiveTheme() {
     $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
@@ -158,6 +162,8 @@ public function testActiveThemePath() {
    * Tests the escaping of objects implementing MarkupInterface.
    *
    * @covers ::escapeFilter
+   *
+   * @group legacy
    */
   public function testSafeStringEscaping() {
     $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
@@ -245,6 +251,8 @@ public function providerTestRenderVar() {
   /**
    * @covers ::escapeFilter
    * @covers ::bubbleArgMetadata
+   *
+   * @group legacy
    */
   public function testEscapeWithGeneratedLink() {
     $renderer = $this->prophesize(RendererInterface::class);
diff --git a/core/tests/Drupal/Tests/Core/Test/LegacyTest.php b/core/tests/Drupal/Tests/Core/Test/LegacyTest.php
new file mode 100644
index 0000000..cca015c
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Test/LegacyTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\Tests\Core\Test;
+
+use Drupal\Tests\UnitTestCase;
+use Symfony\Bridge\PhpUnit\ErrorAssert;
+
+/**
+ * @group legacy
+ */
+class LegacyTest extends UnitTestCase {
+
+  /**
+   * Tests that the Symfony PHPUnit Bridge is working.
+   */
+  public function testSymfonyPhpUnitBridge() {
+    ErrorAssert::assertDeprecationsAreTriggered('Testing Symfony PHPUnit Bridge', function () {
+      trigger_error('Testing Symfony PHPUnit Bridge', E_USER_DEPRECATED);
+    });
+  }
+
+  /**
+   * Tests that the Symfony PHPUnit Bridge is working.
+   */
+  public function testSymfonyPhpUnitBridgeHideError() {
+    ErrorAssert::assertDeprecationsAreTriggered('Testing Symfony PHPUnit Bridge', function () {
+      @trigger_error('Testing Symfony PHPUnit Bridge', E_USER_DEPRECATED);
+    });
+  }
+
+}