From 52ab20607c7343d84cb1bff5324e4a6066ad74fa Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 13 Mar 2015 18:08:02 +0100
Subject: [PATCH 1/2] [2.3] add @group legacy

---
 .travis.yml                                                 | 2 +-
 .../ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php  | 3 +++
 .../Tests/TokenParser/LegacyRenderTokenParserTest.php       | 3 +++
 src/Symfony/Component/Console/Tests/ApplicationTest.php     | 6 ++++++
 src/Symfony/Component/Console/Tests/Command/CommandTest.php | 6 ++++++
 .../Component/Console/Tests/Input/InputDefinitionTest.php   | 6 ++++++
 src/Symfony/Component/Form/Tests/AbstractLayoutTest.php     | 6 ++++++
 .../EventListener/LegacyBindRequestListenerTest.php         | 1 +
 .../Component/Routing/Tests/Annotation/RouteTest.php        | 3 +++
 src/Symfony/Component/Routing/Tests/RouteTest.php           | 3 +++
 10 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 06fc091ab5..fb8f8acbaa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,5 +46,5 @@ install:
 script:
     - if [ "$deps" = "no" ]; then echo "$components" | 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 [ "$deps" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi;
-    - if [ "$deps" = "high" ]; then echo "$components" | 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 [ "$deps" = "high" ]; then echo "$components" | 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 [ "$deps" = "low" ]; then echo "$components" | 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/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php
index 3fdb978666..dd53bf4226 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php
@@ -21,6 +21,9 @@ class UnloadedEntityChoiceListSingleIntIdTest extends AbstractEntityChoiceListSi
         $this->markTestSkipped('Non-existing values are not detected for unloaded choice lists.');
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForValuesIgnoresNonExistingValues()
     {
         $this->markTestSkipped('Non-existing values are not detected for unloaded choice lists.');
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php b/src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php
index a11ae8b9b8..57e361b5db 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php
@@ -15,6 +15,9 @@ use Symfony\Bundle\TwigBundle\Tests\TestCase;
 use Symfony\Bundle\TwigBundle\TokenParser\RenderTokenParser;
 use Symfony\Bundle\TwigBundle\Node\RenderNode;
 
+/**
+ * @group legacy
+ */
 class LegacyRenderTokenParserTest extends TestCase
 {
     protected function setUp()
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index 6180b6122d..80ab7fb5ed 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -424,6 +424,9 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyAsText()
     {
         $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
@@ -435,6 +438,9 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_astext2.txt', $this->normalizeLineBreaks($application->asText('foo')), '->asText() returns a text representation of the application');
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyAsXml()
     {
         $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
index a9455ca71d..1249dbc5c4 100644
--- a/src/Symfony/Component/Console/Tests/Command/CommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -318,6 +318,9 @@ class CommandTest extends \PHPUnit_Framework_TestCase
         $output->writeln('from the code...');
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyAsText()
     {
         $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
@@ -329,6 +332,9 @@ class CommandTest extends \PHPUnit_Framework_TestCase
         $this->assertStringEqualsFile(self::$fixturesPath.'/command_astext.txt', $command->asText(), '->asText() returns a text representation of the command');
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyAsXml()
     {
         $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php b/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
index 18bcb94b47..a73e3f467e 100644
--- a/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
@@ -373,6 +373,9 @@ class InputDefinitionTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('foo1 ... [fooN]', $definition->getSynopsis(), '->getSynopsis() returns a synopsis of arguments and options');
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyAsText()
     {
         $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
@@ -390,6 +393,9 @@ class InputDefinitionTest extends \PHPUnit_Framework_TestCase
         $this->assertStringEqualsFile(self::$fixtures.'/definition_astext.txt', $definition->asText(), '->asText() returns a textual representation of the InputDefinition');
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyAsXml()
     {
         $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
index cfc41cdf48..f741ce0b68 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -122,6 +122,9 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
 
     abstract protected function setTheme(FormView $view, array $themes);
 
+    /**
+     * @group legacy
+     */
     public function testLegacyEnctype()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -133,6 +136,9 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
         $this->assertEquals('enctype="multipart/form-data"', $this->renderEnctype($form->createView()));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyNoEnctype()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php
index 183d3a7a3a..521f7b3c17 100644
--- a/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group legacy
  */
 class LegacyBindRequestListenerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php b/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
index 5cdf11f491..00219f08d1 100644
--- a/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
+++ b/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
@@ -46,6 +46,9 @@ class RouteTest extends \PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetPattern()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php
index 8b8f02fb42..fdb8bbfbd8 100644
--- a/src/Symfony/Component/Routing/Tests/RouteTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouteTest.php
@@ -201,6 +201,9 @@ class RouteTest extends \PHPUnit_Framework_TestCase
         $this->assertNotSame($compiled, $route->compile(), '->compile() recompiles if the route was modified');
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyPattern()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);

From ed40c909758ff58865202e95e526fdb334c681b3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 13 Mar 2015 18:32:20 +0100
Subject: [PATCH 2/2] [2.6] add @group legacy

---
 .../GenericEntityChoiceListTest.php           |  3 ++
 ...egacyUniqueEntityValidator2Dot4ApiTest.php |  1 +
 ...gacyUniqueEntityValidatorLegacyApiTest.php |  1 +
 .../Form/ChoiceList/ModelChoiceListTest.php   |  9 ++++++
 .../Tests/Templating/GlobalVariablesTest.php  |  3 ++
 .../LegacyApcUniversalClassLoaderTest.php     |  3 ++
 .../Tests/LegacyUniversalClassLoaderTest.php  |  3 ++
 .../Tests/Helper/LegacyDialogHelperTest.php   |  3 ++
 .../Tests/Helper/LegacyProgressHelperTest.php |  3 ++
 .../Tests/Helper/LegacyTableHelperTest.php    |  3 ++
 .../Console/Tests/Input/StringInputTest.php   |  3 ++
 .../Debug/Tests/ErrorHandlerTest.php          |  3 ++
 .../ClassNotFoundFatalErrorHandlerTest.php    |  1 +
 .../Tests/LegacyContainerBuilderTest.php      |  3 ++
 .../Tests/LegacyDefinitionTest.php            |  3 ++
 .../EventDispatcher/Tests/EventTest.php       | 12 ++++++++
 .../ChoiceList/AbstractChoiceListTest.php     | 30 +++++++++++++++++++
 .../Core/ChoiceList/LazyChoiceListTest.php    |  6 ++++
 .../Core/ChoiceList/ObjectChoiceListTest.php  | 12 ++++++++
 .../SimpleNumericChoiceListTest.php           |  6 ++++
 .../LegacyDefaultCsrfProviderTest.php         |  3 +-
 .../LegacySessionCsrfProviderTest.php         |  3 ++
 .../LegacyFormValidator2Dot4ApiTest.php       |  1 +
 .../LegacyFormValidatorLegacyApiTest.php      |  1 +
 .../Handler/LegacyPdoSessionHandlerTest.php   |  3 ++
 .../EventListener/ProfilerListenerTest.php    |  2 ++
 .../Component/HttpKernel/Tests/KernelTest.php |  9 ++++++
 .../Tests/LegacyOptionsResolverTest.php       |  3 ++
 .../Tests/LegacyOptionsTest.php               |  3 ++
 .../Dumper/LegacyApacheMatcherDumperTest.php  |  3 ++
 .../Matcher/LegacyApacheUrlMatcherTest.php    |  3 ++
 ...egacyUserPasswordValidator2Dot4ApiTest.php |  1 +
 .../LegacyUserPasswordValidatorTest.php       |  1 +
 .../LegacySecurityContextInterfaceTest.php    |  3 ++
 .../Templating/Tests/Loader/LoaderTest.php    |  3 ++
 .../LegacyAllValidator2Dot4ApiTest.php        |  1 +
 .../LegacyAllValidatorLegacyApiTest.php       |  1 +
 .../LegacyBlankValidator2Dot4ApiTest.php      |  1 +
 .../LegacyBlankValidatorLegacyApiTest.php     |  1 +
 .../LegacyCallbackValidator2Dot4ApiTest.php   |  1 +
 .../LegacyCallbackValidatorLegacyApiTest.php  |  1 +
 .../LegacyCardSchemeValidator2Dot4ApiTest.php |  1 +
 ...LegacyCardSchemeValidatorLegacyApiTest.php |  1 +
 .../LegacyChoiceValidator2Dot4ApiTest.php     |  1 +
 .../LegacyChoiceValidatorLegacyApiTest.php    |  1 +
 ...cyCollectionValidatorArray2Dot4ApiTest.php |  3 ++
 ...yCollectionValidatorArrayLegacyApiTest.php |  3 ++
 ...ectionValidatorArrayObject2Dot4ApiTest.php |  3 ++
 ...ctionValidatorArrayObjectLegacyApiTest.php |  3 ++
 ...ValidatorCustomArrayObject2Dot4ApiTest.php |  3 ++
 ...alidatorCustomArrayObjectLegacyApiTest.php |  3 ++
 .../LegacyCountValidatorArray2Dot4ApiTest.php |  1 +
 ...LegacyCountValidatorArrayLegacyApiTest.php |  1 +
 ...acyCountValidatorCountable2Dot4ApiTest.php |  1 +
 ...cyCountValidatorCountableLegacyApiTest.php |  1 +
 .../LegacyCurrencyValidator2Dot4ApiTest.php   |  1 +
 .../LegacyCurrencyValidatorLegacyApiTest.php  |  1 +
 .../LegacyDateTimeValidator2Dot4ApiTest.php   |  1 +
 .../LegacyDateTimeValidatorLegacyApiTest.php  |  1 +
 .../LegacyDateValidator2Dot4ApiTest.php       |  1 +
 .../LegacyDateValidatorLegacyApiTest.php      |  1 +
 .../LegacyEmailValidator2Dot4ApiTest.php      |  1 +
 .../LegacyEmailValidatorLegacyApiTest.php     |  1 +
 .../LegacyEqualToValidator2Dot4ApiTest.php    |  1 +
 .../LegacyEqualToValidatorLegacyApiTest.php   |  1 +
 .../LegacyExpressionValidator2Dot4ApiTest.php |  1 +
 ...LegacyExpressionValidatorLegacyApiTest.php |  1 +
 .../LegacyFalseValidator2Dot4ApiTest.php      |  1 +
 .../LegacyFalseValidatorLegacyApiTest.php     |  1 +
 .../LegacyFileValidatorObject2Dot4ApiTest.php |  1 +
 ...LegacyFileValidatorObjectLegacyApiTest.php |  1 +
 .../LegacyFileValidatorPath2Dot4ApiTest.php   |  1 +
 .../LegacyFileValidatorPathLegacyApiTest.php  |  1 +
 ...reaterThanOrEqualValidator2Dot4ApiTest.php |  1 +
 ...eaterThanOrEqualValidatorLegacyApiTest.php |  1 +
 ...LegacyGreaterThanValidator2Dot4ApiTest.php |  1 +
 ...egacyGreaterThanValidatorLegacyApiTest.php |  1 +
 .../LegacyIbanValidator2Dot4ApiTest.php       |  1 +
 .../LegacyIbanValidatorLegacyApiTest.php      |  1 +
 ...LegacyIdenticalToValidator2Dot4ApiTest.php |  1 +
 ...egacyIdenticalToValidatorLegacyApiTest.php |  1 +
 .../LegacyImageValidator2Dot4ApiTest.php      |  1 +
 .../LegacyImageValidatorLegacyApiTest.php     |  1 +
 .../LegacyIpValidator2Dot4ApiTest.php         |  1 +
 .../LegacyIpValidatorLegacyApiTest.php        |  1 +
 .../LegacyIsbnValidator2Dot4ApiTest.php       |  1 +
 .../LegacyIsbnValidatorLegacyApiTest.php      |  1 +
 .../LegacyIssnValidator2Dot4ApiTest.php       |  1 +
 .../LegacyIssnValidatorLegacyApiTest.php      |  1 +
 .../LegacyLanguageValidator2Dot4ApiTest.php   |  1 +
 .../LegacyLanguageValidatorLegacyApiTest.php  |  1 +
 .../LegacyLengthValidator2Dot4ApiTest.php     |  1 +
 .../LegacyLengthValidatorLegacyApiTest.php    |  1 +
 ...cyLessThanOrEqualValidator2Dot4ApiTest.php |  1 +
 ...yLessThanOrEqualValidatorLegacyApiTest.php |  1 +
 .../LegacyLessThanValidator2Dot4ApiTest.php   |  1 +
 .../LegacyLessThanValidatorLegacyApiTest.php  |  1 +
 .../LegacyLocaleValidator2Dot4ApiTest.php     |  1 +
 .../LegacyLocaleValidatorLegacyApiTest.php    |  1 +
 .../LegacyLuhnValidator2Dot4ApiTest.php       |  1 +
 .../LegacyLuhnValidatorLegacyApiTest.php      |  1 +
 .../LegacyNotBlankValidator2Dot4ApiTest.php   |  1 +
 .../LegacyNotBlankValidatorLegacyApiTest.php  |  1 +
 .../LegacyNotEqualToValidator2Dot4ApiTest.php |  1 +
 ...LegacyNotEqualToValidatorLegacyApiTest.php |  1 +
 ...acyNotIdenticalToValidator2Dot4ApiTest.php |  1 +
 ...cyNotIdenticalToValidatorLegacyApiTest.php |  1 +
 .../LegacyNotNullValidator2Dot4ApiTest.php    |  1 +
 .../LegacyNotNullValidatorLegacyApiTest.php   |  1 +
 .../LegacyNullValidator2Dot4ApiTest.php       |  1 +
 .../LegacyNullValidatorLegacyApiTest.php      |  1 +
 .../LegacyRangeValidator2Dot4ApiTest.php      |  1 +
 .../LegacyRangeValidatorLegacyApiTest.php     |  1 +
 .../LegacyRegexValidator2Dot4ApiTest.php      |  1 +
 .../LegacyRegexValidatorLegacyApiTest.php     |  1 +
 .../LegacyTimeValidator2Dot4ApiTest.php       |  1 +
 .../LegacyTimeValidatorLegacyApiTest.php      |  1 +
 .../LegacyTrueValidator2Dot4ApiTest.php       |  1 +
 .../LegacyTrueValidatorLegacyApiTest.php      |  1 +
 .../LegacyTypeValidator2Dot4ApiTest.php       |  1 +
 .../LegacyTypeValidatorLegacyApiTest.php      |  1 +
 .../LegacyUrlValidator2Dot4ApiTest.php        |  1 +
 .../LegacyUrlValidatorLegacyApiTest.php       |  1 +
 .../LegacyUuidValidator2Dot4ApiTest.php       |  1 +
 .../LegacyUuidValidatorLegacyApiTest.php      |  1 +
 .../Tests/LegacyExecutionContextTest.php      |  3 ++
 .../Mapping/Cache/LegacyApcCacheTest.php      |  3 ++
 .../Mapping/LegacyElementMetadataTest.php     |  3 ++
 .../Tests/Validator/Abstract2Dot5ApiTest.php  |  1 +
 .../Tests/Validator/AbstractValidatorTest.php |  2 ++
 .../Validator/LegacyValidator2Dot5ApiTest.php |  3 ++
 .../LegacyValidatorLegacyApiTest.php          |  3 ++
 .../Validator/Tests/ValidatorBuilderTest.php  |  9 ++++++
 133 files changed, 281 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/GenericEntityChoiceListTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/GenericEntityChoiceListTest.php
index cc9b21cf9d..9b60c87661 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/GenericEntityChoiceListTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/GenericEntityChoiceListTest.php
@@ -267,6 +267,9 @@ class GenericEntityChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array(1, 2), $choiceList->getValuesForChoices(array($item1, $item2)));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyInitShorthandEntityName()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidator2Dot4ApiTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidator2Dot4ApiTest.php
index 3e1151d520..84743596d5 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidator2Dot4ApiTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.4
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyUniqueEntityValidator2Dot4ApiTest extends UniqueEntityValidatorTest
 {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php
index 07382d90e9..f639171864 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.4
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyUniqueEntityValidatorLegacyApiTest extends UniqueEntityValidatorTest
 {
diff --git a/src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php b/src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php
index 5fb49a1fc8..bc0cfb2d4e 100644
--- a/src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php
+++ b/src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php
@@ -204,6 +204,9 @@ class ModelChoiceListTest extends Propel1TestCase
         $this->assertEquals(array('1'), $choiceList->getValuesForChoices(array($choosenItem)));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacygetIndicesForChoices()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -228,6 +231,9 @@ class ModelChoiceListTest extends Propel1TestCase
         $this->assertEquals(array(1, 2), $choiceList->getIndicesForChoices(array($item1, $item2)));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyDifferentEqualObjectsAreChoosen()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -249,6 +255,9 @@ class ModelChoiceListTest extends Propel1TestCase
         $this->assertEquals(array(1), $choiceList->getIndicesForChoices(array($choosenItem)));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForNullChoices()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
index cddfd5a2ae..89882951d7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
@@ -26,6 +26,9 @@ class GlobalVariablesTest extends TestCase
         $this->globals = new GlobalVariables($this->container);
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetSecurity()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
index 8a1f203118..48b46fa3ec 100644
--- a/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
+++ b/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\ClassLoader\Tests;
 
 use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
 
+/**
+ * @group legacy
+ */
 class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
diff --git a/src/Symfony/Component/ClassLoader/Tests/LegacyUniversalClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/LegacyUniversalClassLoaderTest.php
index f5e5ef8ef9..9149e2e863 100644
--- a/src/Symfony/Component/ClassLoader/Tests/LegacyUniversalClassLoaderTest.php
+++ b/src/Symfony/Component/ClassLoader/Tests/LegacyUniversalClassLoaderTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\ClassLoader\Tests;
 
 use Symfony\Component\ClassLoader\UniversalClassLoader;
 
+/**
+ * @group legacy
+ */
 class LegacyUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
diff --git a/src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
index 86ccd7e3bf..cf07793c3d 100644
--- a/src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
@@ -17,6 +17,9 @@ use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Output\StreamOutput;
 
+/**
+ * @group legacy
+ */
 class LegacyDialogHelperTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
diff --git a/src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
index 72d0de568c..e93057a164 100644
--- a/src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
@@ -14,6 +14,9 @@ namespace Symfony\Component\Console\Tests\Helper;
 use Symfony\Component\Console\Helper\ProgressHelper;
 use Symfony\Component\Console\Output\StreamOutput;
 
+/**
+ * @group legacy
+ */
 class LegacyProgressHelperTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
diff --git a/src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
index e164a547fc..9cb1810a3f 100644
--- a/src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
@@ -14,6 +14,9 @@ namespace Symfony\Component\Console\Tests\Helper;
 use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Output\StreamOutput;
 
+/**
+ * @group legacy
+ */
 class LegacyTableHelperTest extends \PHPUnit_Framework_TestCase
 {
     protected $stream;
diff --git a/src/Symfony/Component/Console/Tests/Input/StringInputTest.php b/src/Symfony/Component/Console/Tests/Input/StringInputTest.php
index a79a7181dd..0bf5e1892e 100644
--- a/src/Symfony/Component/Console/Tests/Input/StringInputTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/StringInputTest.php
@@ -41,6 +41,9 @@ class StringInputTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('bar', $input->getOption('foo'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyInputOptionDefinitionInConstructor()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
index 663d6cad9e..0f52680370 100644
--- a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
+++ b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -359,6 +359,9 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyInterface()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
index 1ae6fc4f64..06b22a83c8 100644
--- a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
+++ b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -36,6 +36,7 @@ class ClassNotFoundFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider provideLegacyClassNotFoundData
+     * @group legacy
      */
     public function testLegacyHandleClassNotFound($error, $translatedMessage, $autoloader)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/LegacyContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/LegacyContainerBuilderTest.php
index 7f57c99d37..b8512a2610 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/LegacyContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/LegacyContainerBuilderTest.php
@@ -14,6 +14,9 @@ namespace Symfony\Component\DependencyInjection\Tests;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
+/**
+ * @group legacy
+ */
 class LegacyContainerBuilderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/LegacyDefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/LegacyDefinitionTest.php
index 9fb0c7ff0e..b85d81f481 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/LegacyDefinitionTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/LegacyDefinitionTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\DependencyInjection\Tests;
 
 use Symfony\Component\DependencyInjection\Definition;
 
+/**
+ * @group legacy
+ */
 class LegacyDefinitionTest extends \PHPUnit_Framework_TestCase
 {
     public function testSetGetFactoryClass()
diff --git a/src/Symfony/Component/EventDispatcher/Tests/EventTest.php b/src/Symfony/Component/EventDispatcher/Tests/EventTest.php
index 8f2fb7358e..4bd2697220 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/EventTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/EventTest.php
@@ -60,6 +60,9 @@ class EventTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($this->event->isPropagationStopped());
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacySetDispatcher()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -67,18 +70,27 @@ class EventTest extends \PHPUnit_Framework_TestCase
         $this->assertSame($this->dispatcher, $this->event->getDispatcher());
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetDispatcher()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
         $this->assertNull($this->event->getDispatcher());
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetName()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
         $this->assertNull($this->event->getName());
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacySetName()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/AbstractChoiceListTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/AbstractChoiceListTest.php
index f7615546be..68ef4dca4f 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/AbstractChoiceListTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/AbstractChoiceListTest.php
@@ -161,6 +161,9 @@ abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertSame($this->values, $this->list->getValues());
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForChoices()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -169,6 +172,9 @@ abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array($this->index1, $this->index2), $this->list->getIndicesForChoices($choices));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForChoicesPreservesKeys()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -177,6 +183,9 @@ abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array(5 => $this->index1, 8 => $this->index2), $this->list->getIndicesForChoices($choices));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForChoicesPreservesOrder()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -185,6 +194,9 @@ abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array($this->index2, $this->index1), $this->list->getIndicesForChoices($choices));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForChoicesIgnoresNonExistingChoices()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -193,6 +205,9 @@ abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array($this->index1, $this->index2), $this->list->getIndicesForChoices($choices));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForChoicesEmpty()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -200,6 +215,9 @@ abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array(), $this->list->getIndicesForChoices(array()));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForValues()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -209,6 +227,9 @@ abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array($this->index1, $this->index2), $this->list->getIndicesForValues($values));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForValuesPreservesKeys()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -218,6 +239,9 @@ abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array(5 => $this->index1, 8 => $this->index2), $this->list->getIndicesForValues($values));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForValuesPreservesOrder()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -226,6 +250,9 @@ abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array($this->index2, $this->index1), $this->list->getIndicesForValues($values));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForValuesIgnoresNonExistingValues()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -234,6 +261,9 @@ abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array($this->index1, $this->index2), $this->list->getIndicesForValues($values));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForValuesEmpty()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php
index 4b23916673..0e5e2e6527 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php
@@ -57,6 +57,9 @@ class LazyChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array(0 => new ChoiceView('a', 'a', 'A'), 2 => new ChoiceView('c', 'c', 'C')), $this->list->getRemainingViews());
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForChoices()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -65,6 +68,9 @@ class LazyChoiceListTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array(1, 2), $this->list->getIndicesForChoices($choices));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForValues()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/ObjectChoiceListTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/ObjectChoiceListTest.php
index eca3169150..2bb06349ae 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/ObjectChoiceListTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/ObjectChoiceListTest.php
@@ -185,6 +185,9 @@ class ObjectChoiceListTest extends AbstractChoiceListTest
         );
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForChoicesWithValuePath()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -202,6 +205,9 @@ class ObjectChoiceListTest extends AbstractChoiceListTest
         $this->assertSame(array($this->index1, $this->index2), $this->list->getIndicesForChoices($choices));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForChoicesWithValuePathPreservesKeys()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -218,6 +224,9 @@ class ObjectChoiceListTest extends AbstractChoiceListTest
         $this->assertSame(array(5 => $this->index1, 8 => $this->index2), $this->list->getIndicesForChoices($choices));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForChoicesWithValuePathPreservesOrder()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -234,6 +243,9 @@ class ObjectChoiceListTest extends AbstractChoiceListTest
         $this->assertSame(array($this->index2, $this->index1), $this->list->getIndicesForChoices($choices));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForChoicesWithValuePathIgnoresNonExistingChoices()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/SimpleNumericChoiceListTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/SimpleNumericChoiceListTest.php
index 9bbac31a37..b351790c45 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/SimpleNumericChoiceListTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/SimpleNumericChoiceListTest.php
@@ -15,6 +15,9 @@ use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList;
 
 class SimpleNumericChoiceListTest extends AbstractChoiceListTest
 {
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForChoicesDealsWithNumericChoices()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -24,6 +27,9 @@ class SimpleNumericChoiceListTest extends AbstractChoiceListTest
         $this->assertSame(array(0, 1), $this->list->getIndicesForChoices($choices));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetIndicesForValuesDealsWithNumericValues()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
index f201f99862..c1cf354442 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
@@ -16,8 +16,9 @@ use Symfony\Component\Form\Extension\Csrf\CsrfProvider\DefaultCsrfProvider;
 /**
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
+ * @group legacy
  */
-class DefaultCsrfProviderTest extends \PHPUnit_Framework_TestCase
+class LegacyDefaultCsrfProviderTest extends \PHPUnit_Framework_TestCase
 {
     protected $provider;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacySessionCsrfProviderTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacySessionCsrfProviderTest.php
index 018f80fa44..eb4f58c8b6 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacySessionCsrfProviderTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacySessionCsrfProviderTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\Form\Tests\Extension\Csrf\CsrfProvider;
 
 use Symfony\Component\Form\Extension\Csrf\CsrfProvider\SessionCsrfProvider;
 
+/**
+ * @group legacy
+ */
 class LegacySessionCsrfProviderTest extends \PHPUnit_Framework_TestCase
 {
     protected $provider;
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidator2Dot4ApiTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidator2Dot4ApiTest.php
index fb3208facd..f94df0c7e3 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyFormValidator2Dot4ApiTest extends FormValidatorTest
 {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php
index faa68b2518..9adb364a39 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyFormValidatorLegacyApiTest extends FormValidatorTest
 {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
index 2924501382..92f890152d 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\LegacyPdoSessionHandler;
 
+/**
+ * @group legacy
+ */
 class LegacyPdoSessionHandlerTest extends \PHPUnit_Framework_TestCase
 {
     private $pdo;
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
index c68f3af37b..605ea9dd24 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
@@ -24,6 +24,8 @@ class ProfilerListenerTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Test to ensure BC without RequestStack
+     *
+     * @group legacy
      */
     public function testLegacyEventsWithoutRequestStack()
     {
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 3101b12bd7..2b75ba222f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -312,6 +312,9 @@ EOF;
         $this->assertEquals($expected, $output);
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyIsClassInActiveBundleFalse()
     {
         $kernel = $this->getKernelMockForIsClassInActiveBundleTest();
@@ -319,6 +322,9 @@ EOF;
         $this->assertFalse($kernel->isClassInActiveBundle('Not\In\Active\Bundle'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyIsClassInActiveBundleFalseNoNamespace()
     {
         $kernel = $this->getKernelMockForIsClassInActiveBundleTest();
@@ -326,6 +332,9 @@ EOF;
         $this->assertFalse($kernel->isClassInActiveBundle('NotNamespacedClass'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyIsClassInActiveBundleTrue()
     {
         $kernel = $this->getKernelMockForIsClassInActiveBundleTest();
diff --git a/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsResolverTest.php
index 840343aa4a..45da53b3b6 100644
--- a/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsResolverTest.php
+++ b/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsResolverTest.php
@@ -14,6 +14,9 @@ namespace Symfony\Component\OptionsResolver\Tests;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\Options;
 
+/**
+ * @group legacy
+ */
 class LegacyOptionsResolverTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php b/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php
index ccdb5bd963..e7bd64b09f 100644
--- a/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php
+++ b/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php
@@ -14,6 +14,9 @@ namespace Symfony\Component\OptionsResolver\Tests;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @group legacy
+ */
 class LegacyOptionsTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
index 54eec42dc3..5ba2502430 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
@@ -15,6 +15,9 @@ use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Matcher\Dumper\ApacheMatcherDumper;
 
+/**
+ * @group legacy
+ */
 class LegacyApacheMatcherDumperTest extends \PHPUnit_Framework_TestCase
 {
     protected static $fixturesPath;
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php
index 3a02dea0e6..f42b7f206b 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php
@@ -15,6 +15,9 @@ use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Matcher\ApacheUrlMatcher;
 
+/**
+ * @group legacy
+ */
 class LegacyApacheUrlMatcherTest extends \PHPUnit_Framework_TestCase
 {
     protected $server;
diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidator2Dot4ApiTest.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidator2Dot4ApiTest.php
index 4cba36374d..cfbfdc16d9 100644
--- a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.4
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyUserPasswordValidator2Dot4ApiTest extends UserPasswordValidatorTest
 {
diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
index 5cfe4440af..54258e34ca 100644
--- a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.4
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest
 {
diff --git a/src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php b/src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php
index 8f684758f8..3fad2b15aa 100644
--- a/src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php
+++ b/src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php
@@ -14,6 +14,9 @@ namespace Symfony\Component\Security\Tests\Core;
 use Symfony\Component\Security\Core\SecurityContextInterface;
 use Symfony\Component\Security\Core\Security;
 
+/**
+ * @group legacy
+ */
 class LegacySecurityContextInterfaceTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php b/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
index b11ed7081b..a42a1185d9 100644
--- a/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
+++ b/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
@@ -24,6 +24,9 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
         $this->assertSame($logger, $loader->getLogger(), '->setLogger() sets the logger instance');
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyGetSetDebugger()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidator2Dot4ApiTest.php
index 2d2a1eb833..d5a41fb0e5 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyAllValidator2Dot4ApiTest extends AllValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidatorLegacyApiTest.php
index 03cb48bb6e..649bfe1c72 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyAllValidatorLegacyApiTest extends AllValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidator2Dot4ApiTest.php
index 3c47b99b71..0cfb1aaa5f 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyBlankValidator2Dot4ApiTest extends BlankValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidatorLegacyApiTest.php
index 047113f1ca..00b8a7ae6d 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyBlankValidatorLegacyApiTest extends BlankValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidator2Dot4ApiTest.php
index 9cb42de80f..efcb5ec560 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyCallbackValidator2Dot4ApiTest extends CallbackValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidatorLegacyApiTest.php
index ef19fa04c1..8f3ea2b87c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyCallbackValidatorLegacyApiTest extends CallbackValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidator2Dot4ApiTest.php
index 37141dad43..0f467dda49 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyCardSchemeValidator2Dot4ApiTest extends CardSchemeValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidatorLegacyApiTest.php
index dab03e1df9..e4b41846dd 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyCardSchemeValidatorLegacyApiTest extends CardSchemeValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidator2Dot4ApiTest.php
index 725e574a23..71277f7bf3 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyChoiceValidator2Dot4ApiTest extends ChoiceValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidatorLegacyApiTest.php
index a70c428ff2..9237df5513 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyChoiceValidatorLegacyApiTest extends ChoiceValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArray2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArray2Dot4ApiTest.php
index 9077936de9..38269148e3 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArray2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArray2Dot4ApiTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\Validator\Tests\Constraints;
 
 use Symfony\Component\Validator\Validation;
 
+/**
+ * @group legacy
+ */
 class LegacyCollectionValidatorArray2Dot4ApiTest extends CollectionValidatorArrayTest
 {
     protected function getApiVersion()
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayLegacyApiTest.php
index 02ceb192a9..45ca1df385 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayLegacyApiTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\Validator\Tests\Constraints;
 
 use Symfony\Component\Validator\Validation;
 
+/**
+ * @group legacy
+ */
 class LegacyCollectionValidatorArrayLegacyApiTest extends CollectionValidatorArrayTest
 {
     protected function getApiVersion()
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayObject2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayObject2Dot4ApiTest.php
index 1146502341..22dbe46a66 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayObject2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayObject2Dot4ApiTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\Validator\Tests\Constraints;
 
 use Symfony\Component\Validator\Validation;
 
+/**
+ * @group legacy
+ */
 class LegacyCollectionValidatorArrayObject2Dot4ApiTest extends CollectionValidatorArrayObjectTest
 {
     protected function getApiVersion()
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayObjectLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayObjectLegacyApiTest.php
index 3a2dba9978..f28aed3b12 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayObjectLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayObjectLegacyApiTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\Validator\Tests\Constraints;
 
 use Symfony\Component\Validator\Validation;
 
+/**
+ * @group legacy
+ */
 class LegacyCollectionValidatorArrayObjectLegacyApiTest extends CollectionValidatorArrayObjectTest
 {
     protected function getApiVersion()
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorCustomArrayObject2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorCustomArrayObject2Dot4ApiTest.php
index f5a9bd53cd..29ce241f98 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorCustomArrayObject2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorCustomArrayObject2Dot4ApiTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\Validator\Tests\Constraints;
 
 use Symfony\Component\Validator\Validation;
 
+/**
+ * @group legacy
+ */
 class LegacyCollectionValidatorCustomArrayObject2Dot4ApiTest extends CollectionValidatorCustomArrayObjectTest
 {
     protected function getApiVersion()
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorCustomArrayObjectLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorCustomArrayObjectLegacyApiTest.php
index e65147fb21..b04053f246 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorCustomArrayObjectLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorCustomArrayObjectLegacyApiTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\Validator\Tests\Constraints;
 
 use Symfony\Component\Validator\Validation;
 
+/**
+ * @group legacy
+ */
 class LegacyCollectionValidatorCustomArrayObjectLegacyApiTest extends CollectionValidatorCustomArrayObjectTest
 {
     protected function getApiVersion()
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorArray2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorArray2Dot4ApiTest.php
index 645d6b74dd..2ab8b199da 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorArray2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorArray2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyCountValidatorArray2Dot4ApiTest extends CountValidatorArrayTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorArrayLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorArrayLegacyApiTest.php
index 43f18105ee..d36298811c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorArrayLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorArrayLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyCountValidatorArrayLegacyApiTest extends CountValidatorArrayTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorCountable2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorCountable2Dot4ApiTest.php
index f8531ba298..d0239bb3d9 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorCountable2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorCountable2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyCountValidatorCountable2Dot4ApiTest extends CountValidatorCountableTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorCountableLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorCountableLegacyApiTest.php
index 89e0f3ed24..33b87957bf 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorCountableLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorCountableLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyCountValidatorCountableLegacyApiTest extends CountValidatorCountableTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCurrencyValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCurrencyValidator2Dot4ApiTest.php
index 5a042f0d5c..30685d442f 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCurrencyValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCurrencyValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyCurrencyValidator2Dot4ApiTest extends CurrencyValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCurrencyValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCurrencyValidatorLegacyApiTest.php
index ba291920ef..85cd5d0a6a 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyCurrencyValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyCurrencyValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyCurrencyValidatorLegacyApiTest extends CurrencyValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateTimeValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateTimeValidator2Dot4ApiTest.php
index 27d35a85d7..6c2f6a50c4 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateTimeValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateTimeValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyDateTimeValidator2Dot4ApiTest extends DateTimeValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateTimeValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateTimeValidatorLegacyApiTest.php
index 120d077280..be19302fcf 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateTimeValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateTimeValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyDateTimeValidatorLegacyApiTest extends DateTimeValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateValidator2Dot4ApiTest.php
index 7d54e42839..aab7d431c5 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyDateValidator2Dot4ApiTest extends DateValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateValidatorLegacyApiTest.php
index 03e329e048..3235f42312 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyDateValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyDateValidatorLegacyApiTest extends DateValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyEmailValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyEmailValidator2Dot4ApiTest.php
index a29f918d15..12ccb5e0fe 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyEmailValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyEmailValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyEmailValidator2Dot4ApiTest extends EmailValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyEmailValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyEmailValidatorLegacyApiTest.php
index 477ce14d40..e5f101961e 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyEmailValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyEmailValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyEmailValidatorLegacyApiTest extends EmailValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyEqualToValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyEqualToValidator2Dot4ApiTest.php
index 6f1d2ccbc1..1c7008a59c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyEqualToValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyEqualToValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyEqualToValidator2Dot4ApiTest extends EqualToValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyEqualToValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyEqualToValidatorLegacyApiTest.php
index 16f71123ef..3a72cfbf50 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyEqualToValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyEqualToValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyEqualToValidatorLegacyApiTest extends EqualToValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyExpressionValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyExpressionValidator2Dot4ApiTest.php
index 5188c36965..914e580137 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyExpressionValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyExpressionValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyExpressionValidator2Dot4ApiTest extends ExpressionValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyExpressionValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyExpressionValidatorLegacyApiTest.php
index 8b3ab71b5e..374bba0850 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyExpressionValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyExpressionValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyExpressionValidatorLegacyApiTest extends ExpressionValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidator2Dot4ApiTest.php
index cbd1791cc9..3d65f4e179 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyFalseValidator2Dot4ApiTest extends FalseValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidatorLegacyApiTest.php
index 0fc46b4cb6..5f7cb12bdb 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyFalseValidatorLegacyApiTest extends FalseValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorObject2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorObject2Dot4ApiTest.php
index 27896a6445..3035e4135e 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorObject2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorObject2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyFileValidatorObject2Dot4ApiTest extends FileValidatorObjectTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorObjectLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorObjectLegacyApiTest.php
index 0ff1e739ec..97d5f59690 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorObjectLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorObjectLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyFileValidatorObjectLegacyApiTest extends FileValidatorObjectTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorPath2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorPath2Dot4ApiTest.php
index c195a13d37..a1541444ca 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorPath2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorPath2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyFileValidatorPath2Dot4ApiTest extends FileValidatorPathTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorPathLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorPathLegacyApiTest.php
index c04544b53c..2c298dffcf 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorPathLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorPathLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyFileValidatorPathLegacyApiTest extends FileValidatorPathTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanOrEqualValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanOrEqualValidator2Dot4ApiTest.php
index 90ef99e8f2..5f4a17edb5 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanOrEqualValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanOrEqualValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyGreaterThanOrEqualValidator2Dot4ApiTest extends GreaterThanOrEqualValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanOrEqualValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanOrEqualValidatorLegacyApiTest.php
index 99912358ca..08822a53bd 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanOrEqualValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanOrEqualValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyGreaterThanOrEqualValidatorLegacyApiTest extends GreaterThanOrEqualValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanValidator2Dot4ApiTest.php
index 3edb2ffc17..799e5d8210 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyGreaterThanValidator2Dot4ApiTest extends GreaterThanValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanValidatorLegacyApiTest.php
index 7d04e1e7e6..0808e9bd15 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyGreaterThanValidatorLegacyApiTest extends GreaterThanValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIbanValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIbanValidator2Dot4ApiTest.php
index b89c2f168c..6dac309c17 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIbanValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIbanValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyIbanValidator2Dot4ApiTest extends IbanValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIbanValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIbanValidatorLegacyApiTest.php
index 97b322bd67..0ffc4b1506 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIbanValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIbanValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyIbanValidatorLegacyApiTest extends IbanValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIdenticalToValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIdenticalToValidator2Dot4ApiTest.php
index 2847e79623..99cd9862cd 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIdenticalToValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIdenticalToValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyIdenticalToValidator2Dot4ApiTest extends IdenticalToValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIdenticalToValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIdenticalToValidatorLegacyApiTest.php
index c337f4927c..aade84f65c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIdenticalToValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIdenticalToValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyIdenticalToValidatorLegacyApiTest extends IdenticalToValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyImageValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyImageValidator2Dot4ApiTest.php
index c4b56aa65e..1fee081eac 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyImageValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyImageValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyImageValidator2Dot4ApiTest extends ImageValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyImageValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyImageValidatorLegacyApiTest.php
index c8171232e0..d36c1752f3 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyImageValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyImageValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyImageValidatorLegacyApiTest extends ImageValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIpValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIpValidator2Dot4ApiTest.php
index ca3b506449..99933cf0c0 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIpValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIpValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyIpValidator2Dot4ApiTest extends IpValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIpValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIpValidatorLegacyApiTest.php
index edc2acc6f6..315f2f9ccf 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIpValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIpValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyIpValidatorLegacyApiTest extends IpValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIsbnValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIsbnValidator2Dot4ApiTest.php
index d2b6adfaf7..29455bdf70 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIsbnValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIsbnValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyIsbnValidator2Dot4ApiTest extends IsbnValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIsbnValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIsbnValidatorLegacyApiTest.php
index 33525c1398..156827090b 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIsbnValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIsbnValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyIsbnValidatorLegacyApiTest extends IsbnValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIssnValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIssnValidator2Dot4ApiTest.php
index 1c37e38134..3713fb0d67 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIssnValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIssnValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyIssnValidator2Dot4ApiTest extends IssnValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIssnValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIssnValidatorLegacyApiTest.php
index 0273310cd0..2ff310416d 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyIssnValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyIssnValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyIssnValidatorLegacyApiTest extends IssnValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLanguageValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLanguageValidator2Dot4ApiTest.php
index 4a08c77b9c..f7120751fb 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLanguageValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLanguageValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLanguageValidator2Dot4ApiTest extends LanguageValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLanguageValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLanguageValidatorLegacyApiTest.php
index f2f974fef8..a6471b3d3b 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLanguageValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLanguageValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLanguageValidatorLegacyApiTest extends LanguageValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLengthValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLengthValidator2Dot4ApiTest.php
index 7174c04c94..686d376d9d 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLengthValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLengthValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLengthValidator2Dot4ApiTest extends LengthValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLengthValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLengthValidatorLegacyApiTest.php
index 784cd76493..655f3d6adb 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLengthValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLengthValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLengthValidatorLegacyApiTest extends LengthValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanOrEqualValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanOrEqualValidator2Dot4ApiTest.php
index 7a817fe795..f345ec3622 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanOrEqualValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanOrEqualValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLessThanOrEqualValidator2Dot4ApiTest extends LessThanOrEqualValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanOrEqualValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanOrEqualValidatorLegacyApiTest.php
index d74d8e42d8..2e07ab02ca 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanOrEqualValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanOrEqualValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLessThanOrEqualValidatorLegacyApiTest extends LessThanOrEqualValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanValidator2Dot4ApiTest.php
index 4e11330d8a..074450d419 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLessThanValidator2Dot4ApiTest extends LessThanValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanValidatorLegacyApiTest.php
index ef436fab08..27592b0afc 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLessThanValidatorLegacyApiTest extends LessThanValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLocaleValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLocaleValidator2Dot4ApiTest.php
index 2120384dae..4d119bb918 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLocaleValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLocaleValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLocaleValidator2Dot4ApiTest extends LocaleValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLocaleValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLocaleValidatorLegacyApiTest.php
index e95902efe7..f55d42205f 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLocaleValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLocaleValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLocaleValidatorLegacyApiTest extends LocaleValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLuhnValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLuhnValidator2Dot4ApiTest.php
index 49b2cebd6f..8207ca009c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLuhnValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLuhnValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLuhnValidator2Dot4ApiTest extends LuhnValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLuhnValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLuhnValidatorLegacyApiTest.php
index fb8c31ca30..58555266e9 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyLuhnValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyLuhnValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyLuhnValidatorLegacyApiTest extends LuhnValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotBlankValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotBlankValidator2Dot4ApiTest.php
index f5ac29017a..a6d0faa784 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotBlankValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotBlankValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyNotBlankValidator2Dot4ApiTest extends NotBlankValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotBlankValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotBlankValidatorLegacyApiTest.php
index f34c6c7dba..0aaaa77c44 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotBlankValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotBlankValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyNotBlankValidatorLegacyApiTest extends NotBlankValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotEqualToValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotEqualToValidator2Dot4ApiTest.php
index f9e51a8ada..e48450e52d 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotEqualToValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotEqualToValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyNotEqualToValidator2Dot4ApiTest extends NotEqualToValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotEqualToValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotEqualToValidatorLegacyApiTest.php
index 7ea366085b..df88f96b54 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotEqualToValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotEqualToValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyNotEqualToValidatorLegacyApiTest extends NotEqualToValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotIdenticalToValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotIdenticalToValidator2Dot4ApiTest.php
index 9a38be7bb8..2c00cf5d3a 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotIdenticalToValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotIdenticalToValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyNotIdenticalToValidator2Dot4ApiTest extends NotIdenticalToValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotIdenticalToValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotIdenticalToValidatorLegacyApiTest.php
index ed1fbc7f0b..25819a622f 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotIdenticalToValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotIdenticalToValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyNotIdenticalToValidatorLegacyApiTest extends NotIdenticalToValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotNullValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotNullValidator2Dot4ApiTest.php
index 98197c7439..39b0038750 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotNullValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotNullValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyNotNullValidator2Dot4ApiTest extends NotNullValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotNullValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotNullValidatorLegacyApiTest.php
index d40d759635..41a9e5407c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotNullValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNotNullValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyNotNullValidatorLegacyApiTest extends NotNullValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidator2Dot4ApiTest.php
index dacf1d2023..958e446aa7 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyNullValidator2Dot4ApiTest extends NullValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidatorLegacyApiTest.php
index 390e325394..79536ced6b 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyNullValidatorLegacyApiTest extends NullValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyRangeValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyRangeValidator2Dot4ApiTest.php
index a3df8dfefe..fe23ce8a6c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyRangeValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyRangeValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyRangeValidator2Dot4ApiTest extends RangeValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyRangeValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyRangeValidatorLegacyApiTest.php
index efe7f85c42..866a59adfe 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyRangeValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyRangeValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyRangeValidatorLegacyApiTest extends RangeValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyRegexValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyRegexValidator2Dot4ApiTest.php
index 50f25f0303..dbae24ee0c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyRegexValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyRegexValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyRegexValidator2Dot4ApiTest extends RegexValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyRegexValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyRegexValidatorLegacyApiTest.php
index c58b1a134f..ed1a4648c2 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyRegexValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyRegexValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyRegexValidatorLegacyApiTest extends RegexValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTimeValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTimeValidator2Dot4ApiTest.php
index 318597590b..d4a0678c99 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTimeValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTimeValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyTimeValidator2Dot4ApiTest extends TimeValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTimeValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTimeValidatorLegacyApiTest.php
index ba0e30d553..2458d873ac 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTimeValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTimeValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyTimeValidatorLegacyApiTest extends TimeValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidator2Dot4ApiTest.php
index 8d8c54ceb9..3d00252ebc 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyTrueValidator2Dot4ApiTest extends TrueValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidatorLegacyApiTest.php
index 8a199e0a98..706c08373c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyTrueValidatorLegacyApiTest extends TrueValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTypeValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTypeValidator2Dot4ApiTest.php
index c249240e7f..aed1d0a2ba 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTypeValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTypeValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyTypeValidator2Dot4ApiTest extends TypeValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTypeValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTypeValidatorLegacyApiTest.php
index 808c37fab3..26eb39ffb1 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyTypeValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyTypeValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyTypeValidatorLegacyApiTest extends TypeValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyUrlValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyUrlValidator2Dot4ApiTest.php
index 55564c9f91..287d7192c8 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyUrlValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyUrlValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyUrlValidator2Dot4ApiTest extends UrlValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyUrlValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyUrlValidatorLegacyApiTest.php
index 8e1eb20841..0830ddb40f 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyUrlValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyUrlValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyUrlValidatorLegacyApiTest extends UrlValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyUuidValidator2Dot4ApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyUuidValidator2Dot4ApiTest.php
index c421404bfe..b5efc76770 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyUuidValidator2Dot4ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyUuidValidator2Dot4ApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyUuidValidator2Dot4ApiTest extends UrlValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LegacyUuidValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LegacyUuidValidatorLegacyApiTest.php
index 1fd6f337af..4a4e36298b 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LegacyUuidValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LegacyUuidValidatorLegacyApiTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation;
 /**
  * @since  2.5.3
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @group  legacy
  */
 class LegacyUuidValidatorLegacyApiTest extends UuidValidatorTest
 {
diff --git a/src/Symfony/Component/Validator/Tests/LegacyExecutionContextTest.php b/src/Symfony/Component/Validator/Tests/LegacyExecutionContextTest.php
index 36cba61ce8..4fec2aacb5 100644
--- a/src/Symfony/Component/Validator/Tests/LegacyExecutionContextTest.php
+++ b/src/Symfony/Component/Validator/Tests/LegacyExecutionContextTest.php
@@ -20,6 +20,9 @@ use Symfony\Component\Validator\ExecutionContext;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 use Symfony\Component\Validator\ValidationVisitor;
 
+/**
+ * @group legacy
+ */
 class LegacyExecutionContextTest extends \PHPUnit_Framework_TestCase
 {
     const TRANS_DOMAIN = 'trans_domain';
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
index 009e7e38ef..bb69cf5e74 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\Validator\Tests\Mapping\Cache;
 
 use Symfony\Component\Validator\Mapping\Cache\ApcCache;
 
+/**
+ * @group legacy
+ */
 class LegacyApcCacheTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/LegacyElementMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/LegacyElementMetadataTest.php
index 059479090d..c77e6fe9aa 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/LegacyElementMetadataTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/LegacyElementMetadataTest.php
@@ -15,6 +15,9 @@ use Symfony\Component\Validator\Mapping\ElementMetadata;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
 
+/**
+ * @group legacy
+ */
 class LegacyElementMetadataTest extends \PHPUnit_Framework_TestCase
 {
     protected $metadata;
diff --git a/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php
index 1641d172f5..684731feec 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php
@@ -633,6 +633,7 @@ abstract class Abstract2Dot5ApiTest extends AbstractValidatorTest
 
     /**
      * @expectedException \Symfony\Component\Validator\Exception\UnsupportedMetadataException
+     * @group legacy
      */
     public function testLegacyPropertyMetadataMustImplementPropertyMetadataInterface()
     {
diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
index 4554affdbd..b1c4edba43 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
@@ -840,6 +840,7 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase
      * Cannot be UnsupportedMetadataException for BC with Symfony < 2.5.
      *
      * @expectedException \Symfony\Component\Validator\Exception\ValidatorException
+     * @group legacy
      */
     public function testLegacyValidatePropertyFailsIfPropertiesNotSupported()
     {
@@ -972,6 +973,7 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase
      * Cannot be UnsupportedMetadataException for BC with Symfony < 2.5.
      *
      * @expectedException \Symfony\Component\Validator\Exception\ValidatorException
+     * @group legacy
      */
     public function testLegacyValidatePropertyValueFailsIfPropertiesNotSupported()
     {
diff --git a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php
index 3e1e442f75..624abd4ae1 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php
@@ -17,6 +17,9 @@ use Symfony\Component\Validator\DefaultTranslator;
 use Symfony\Component\Validator\MetadataFactoryInterface;
 use Symfony\Component\Validator\Validator\LegacyValidator;
 
+/**
+ * @group legacy
+ */
 class LegacyValidator2Dot5ApiTest extends Abstract2Dot5ApiTest
 {
     protected function setUp()
diff --git a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php
index 3f02a5af71..965a769f94 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php
@@ -17,6 +17,9 @@ use Symfony\Component\Validator\DefaultTranslator;
 use Symfony\Component\Validator\MetadataFactoryInterface;
 use Symfony\Component\Validator\Validator\LegacyValidator;
 
+/**
+ * @group legacy
+ */
 class LegacyValidatorLegacyApiTest extends AbstractLegacyApiTest
 {
     protected function setUp()
diff --git a/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php b/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
index 0a15737f75..e2585d7990 100644
--- a/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
+++ b/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
@@ -110,6 +110,9 @@ class ValidatorBuilderTest extends \PHPUnit_Framework_TestCase
         $this->assertSame($this->builder, $this->builder->setTranslationDomain('TRANS_DOMAIN'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyDefaultApiVersion()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -123,6 +126,9 @@ class ValidatorBuilderTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacySetApiVersion24()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
@@ -137,6 +143,9 @@ class ValidatorBuilderTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf('Symfony\Component\Validator\Validator\RecursiveValidator', $this->builder->getValidator());
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacySetApiVersion24And25()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);