diff --git a/tests/Symfony/Tests/Components/Console/ApplicationTest.php b/tests/Symfony/Tests/Components/Console/ApplicationTest.php
index 7f351adf0c5f..ec8eebbc4395 100644
--- a/tests/Symfony/Tests/Components/Console/ApplicationTest.php
+++ b/tests/Symfony/Tests/Components/Console/ApplicationTest.php
@@ -22,7 +22,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = realpath(__DIR__.'/../../../../fixtures/Symfony/Components/Console/');
+        self::$fixturesPath = realpath(__DIR__.'/Fixtures/');
         require_once self::$fixturesPath.'/FooCommand.php';
         require_once self::$fixturesPath.'/Foo1Command.php';
         require_once self::$fixturesPath.'/Foo2Command.php';
diff --git a/tests/Symfony/Tests/Components/Console/Command/CommandTest.php b/tests/Symfony/Tests/Components/Console/Command/CommandTest.php
index 38615a2e1702..76d10b7aa3b7 100644
--- a/tests/Symfony/Tests/Components/Console/Command/CommandTest.php
+++ b/tests/Symfony/Tests/Components/Console/Command/CommandTest.php
@@ -29,7 +29,7 @@ class CommandTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = __DIR__.'/../../../../../fixtures/Symfony/Components/Console/';
+        self::$fixturesPath = __DIR__.'/../Fixtures/';
         require_once self::$fixturesPath.'/TestCommand.php';
     }
 
diff --git a/tests/fixtures/Symfony/Components/Console/Foo1Command.php b/tests/Symfony/Tests/Components/Console/Fixtures/Foo1Command.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/Foo1Command.php
rename to tests/Symfony/Tests/Components/Console/Fixtures/Foo1Command.php
diff --git a/tests/fixtures/Symfony/Components/Console/Foo2Command.php b/tests/Symfony/Tests/Components/Console/Fixtures/Foo2Command.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/Foo2Command.php
rename to tests/Symfony/Tests/Components/Console/Fixtures/Foo2Command.php
diff --git a/tests/fixtures/Symfony/Components/Console/FooCommand.php b/tests/Symfony/Tests/Components/Console/Fixtures/FooCommand.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/FooCommand.php
rename to tests/Symfony/Tests/Components/Console/Fixtures/FooCommand.php
diff --git a/tests/fixtures/Symfony/Components/Console/TestCommand.php b/tests/Symfony/Tests/Components/Console/Fixtures/TestCommand.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/TestCommand.php
rename to tests/Symfony/Tests/Components/Console/Fixtures/TestCommand.php
diff --git a/tests/fixtures/Symfony/Components/Console/application_astext1.txt b/tests/Symfony/Tests/Components/Console/Fixtures/application_astext1.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/application_astext1.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/application_astext1.txt
diff --git a/tests/fixtures/Symfony/Components/Console/application_astext2.txt b/tests/Symfony/Tests/Components/Console/Fixtures/application_astext2.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/application_astext2.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/application_astext2.txt
diff --git a/tests/fixtures/Symfony/Components/Console/application_asxml1.txt b/tests/Symfony/Tests/Components/Console/Fixtures/application_asxml1.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/application_asxml1.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/application_asxml1.txt
diff --git a/tests/fixtures/Symfony/Components/Console/application_asxml2.txt b/tests/Symfony/Tests/Components/Console/Fixtures/application_asxml2.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/application_asxml2.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/application_asxml2.txt
diff --git a/tests/fixtures/Symfony/Components/Console/application_gethelp.txt b/tests/Symfony/Tests/Components/Console/Fixtures/application_gethelp.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/application_gethelp.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/application_gethelp.txt
diff --git a/tests/fixtures/Symfony/Components/Console/application_renderexception1.txt b/tests/Symfony/Tests/Components/Console/Fixtures/application_renderexception1.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/application_renderexception1.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/application_renderexception1.txt
diff --git a/tests/fixtures/Symfony/Components/Console/application_renderexception2.txt b/tests/Symfony/Tests/Components/Console/Fixtures/application_renderexception2.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/application_renderexception2.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/application_renderexception2.txt
diff --git a/tests/fixtures/Symfony/Components/Console/application_run1.txt b/tests/Symfony/Tests/Components/Console/Fixtures/application_run1.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/application_run1.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/application_run1.txt
diff --git a/tests/fixtures/Symfony/Components/Console/application_run2.txt b/tests/Symfony/Tests/Components/Console/Fixtures/application_run2.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/application_run2.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/application_run2.txt
diff --git a/tests/fixtures/Symfony/Components/Console/application_run3.txt b/tests/Symfony/Tests/Components/Console/Fixtures/application_run3.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/application_run3.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/application_run3.txt
diff --git a/tests/fixtures/Symfony/Components/Console/application_run4.txt b/tests/Symfony/Tests/Components/Console/Fixtures/application_run4.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/application_run4.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/application_run4.txt
diff --git a/tests/fixtures/Symfony/Components/Console/command_astext.txt b/tests/Symfony/Tests/Components/Console/Fixtures/command_astext.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/command_astext.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/command_astext.txt
diff --git a/tests/fixtures/Symfony/Components/Console/command_asxml.txt b/tests/Symfony/Tests/Components/Console/Fixtures/command_asxml.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/command_asxml.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/command_asxml.txt
diff --git a/tests/fixtures/Symfony/Components/Console/definition_astext.txt b/tests/Symfony/Tests/Components/Console/Fixtures/definition_astext.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/definition_astext.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/definition_astext.txt
diff --git a/tests/fixtures/Symfony/Components/Console/definition_asxml.txt b/tests/Symfony/Tests/Components/Console/Fixtures/definition_asxml.txt
similarity index 100%
rename from tests/fixtures/Symfony/Components/Console/definition_asxml.txt
rename to tests/Symfony/Tests/Components/Console/Fixtures/definition_asxml.txt
diff --git a/tests/Symfony/Tests/Components/Console/Input/InputDefinitionTest.php b/tests/Symfony/Tests/Components/Console/Input/InputDefinitionTest.php
index fb7388005634..a86461bdd8da 100644
--- a/tests/Symfony/Tests/Components/Console/Input/InputDefinitionTest.php
+++ b/tests/Symfony/Tests/Components/Console/Input/InputDefinitionTest.php
@@ -23,7 +23,7 @@ class InputDefinitionTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixtures = __DIR__.'/../../../../../fixtures/Symfony/Components/Console';
+        self::$fixtures = __DIR__.'/../Fixtures/';
     }
 
     public function testConstructor()
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/BuilderConfigurationTest.php b/tests/Symfony/Tests/Components/DependencyInjection/BuilderConfigurationTest.php
index 700bab9166c8..4ed0c0b61a10 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/BuilderConfigurationTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/BuilderConfigurationTest.php
@@ -23,7 +23,7 @@ class BuilderConfigurationTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = __DIR__.'/../../../../fixtures/Symfony/Components/DependencyInjection/';
+        self::$fixturesPath = __DIR__.'/Fixtures/';
     }
 
     /**
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/BuilderTest.php b/tests/Symfony/Tests/Components/DependencyInjection/BuilderTest.php
index 542d4f58c238..d2ae0d76afee 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/BuilderTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/BuilderTest.php
@@ -23,7 +23,7 @@ class BuilderTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = __DIR__.'/../../../../fixtures/Symfony/Components/DependencyInjection/';
+        self::$fixturesPath = __DIR__.'/Fixtures/';
     }
 
     /**
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/CrossCheckTest.php b/tests/Symfony/Tests/Components/DependencyInjection/CrossCheckTest.php
index a4f2357fec21..8670ae206bd3 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/CrossCheckTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/CrossCheckTest.php
@@ -18,7 +18,7 @@ class CrossCheckTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = __DIR__.'/../../../../fixtures/Symfony/Components/DependencyInjection/';
+        self::$fixturesPath = __DIR__.'/Fixtures/';
 
         require_once self::$fixturesPath.'/includes/classes.php';
         require_once self::$fixturesPath.'/includes/foo.php';
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/Dumper/GraphvizDumperTest.php b/tests/Symfony/Tests/Components/DependencyInjection/Dumper/GraphvizDumperTest.php
index d9160408fb41..0abe7fccbf22 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/Dumper/GraphvizDumperTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/Dumper/GraphvizDumperTest.php
@@ -19,7 +19,7 @@ class GraphvizDumperTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = __DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/';
+        self::$fixturesPath = __DIR__.'/../Fixtures/';
     }
 
     public function testDump()
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/Dumper/PhpDumperTest.php b/tests/Symfony/Tests/Components/DependencyInjection/Dumper/PhpDumperTest.php
index 7324952409b5..0cd6a277e154 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/Dumper/PhpDumperTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/Dumper/PhpDumperTest.php
@@ -21,7 +21,7 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = realpath(__DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/');
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
     }
 
     public function testDump()
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/Dumper/XmlDumperTest.php b/tests/Symfony/Tests/Components/DependencyInjection/Dumper/XmlDumperTest.php
index ef53d020b495..84f2e6570d17 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/Dumper/XmlDumperTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/Dumper/XmlDumperTest.php
@@ -19,7 +19,7 @@ class XmlDumperTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = realpath(__DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/');
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
     }
 
     public function testDump()
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/Dumper/YamlDumperTest.php b/tests/Symfony/Tests/Components/DependencyInjection/Dumper/YamlDumperTest.php
index 7383ed34296e..d82bc08c1e79 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/Dumper/YamlDumperTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/Dumper/YamlDumperTest.php
@@ -19,7 +19,7 @@ class YamlDumperTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = realpath(__DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/');
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
     }
 
     public function testDump()
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/containers/container10.php b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/containers/container10.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/containers/container10.php
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/containers/container10.php
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/containers/container8.php b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/containers/container8.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/containers/container8.php
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/containers/container8.php
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/containers/container9.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/containers/container9.php
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services1.dot b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/graphviz/services1.dot
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services1.dot
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/graphviz/services1.dot
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services10-1.dot b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/graphviz/services10-1.dot
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services10-1.dot
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/graphviz/services10-1.dot
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services10.dot b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/graphviz/services10.dot
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services10.dot
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/graphviz/services10.dot
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services9.dot b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/graphviz/services9.dot
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services9.dot
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/graphviz/services9.dot
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/includes/ProjectExtension.php b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/includes/ProjectExtension.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/includes/ProjectExtension.php
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/includes/ProjectExtension.php
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/includes/classes.php b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/includes/classes.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/includes/classes.php
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/includes/classes.php
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/includes/foo.php b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/includes/foo.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/includes/foo.php
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/includes/foo.php
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/ini/nonvalid.ini b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/ini/nonvalid.ini
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/ini/nonvalid.ini
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/ini/nonvalid.ini
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/ini/parameters.ini b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/ini/parameters.ini
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/ini/parameters.ini
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/ini/parameters.ini
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/ini/parameters1.ini b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/ini/parameters1.ini
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/ini/parameters1.ini
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/ini/parameters1.ini
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/ini/parameters2.ini b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/ini/parameters2.ini
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/ini/parameters2.ini
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/ini/parameters2.ini
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/php/services1-1.php b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/php/services1-1.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/php/services1-1.php
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/php/services1-1.php
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/php/services1.php b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/php/services1.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/php/services1.php
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/php/services1.php
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/php/services8.php b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/php/services8.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/php/services8.php
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/php/services8.php
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/php/services9.php b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/php/services9.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/php/services9.php
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/php/services9.php
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/nonvalid.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/nonvalid.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/nonvalid.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/nonvalid.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services1.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services1.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services1.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services1.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services10.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services10.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services10.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services10.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services11.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services11.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services11.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services11.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services12.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services12.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services12.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services12.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services13.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services13.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services13.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services13.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services2.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services2.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services2.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services2.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services3.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services3.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services3.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services3.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services4.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services4.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services4.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services4.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services5.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services5.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services5.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services5.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services6.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services6.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services6.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services6.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services7.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services7.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services7.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services7.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services8.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services8.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services8.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services8.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services9.xml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/xml/services9.xml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/nonvalid1.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/nonvalid1.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/nonvalid1.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/nonvalid1.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/nonvalid2.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/nonvalid2.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/nonvalid2.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/nonvalid2.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services1.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services1.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services1.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services1.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services10.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services10.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services10.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services10.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services11.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services11.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services11.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services11.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services12.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services12.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services12.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services12.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services13.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services13.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services13.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services13.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services2.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services2.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services2.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services2.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services3.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services3.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services3.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services3.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services4.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services4.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services4.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services4.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services6.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services6.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services6.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services6.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services7.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services7.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services7.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services7.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services8.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services8.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services8.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services8.yml
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services9.yml b/tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services9.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/DependencyInjection/yaml/services9.yml
rename to tests/Symfony/Tests/Components/DependencyInjection/Fixtures/yaml/services9.yml
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/Loader/FileLoaderTest.php b/tests/Symfony/Tests/Components/DependencyInjection/Loader/FileLoaderTest.php
index ba52e33db0bd..86bc37c995df 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/Loader/FileLoaderTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/Loader/FileLoaderTest.php
@@ -33,7 +33,7 @@ public function testConstructor()
      */
     public function testGetAbsolutePath()
     {
-        $loader = new ProjectLoader(array(__DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/containers'));
+        $loader = new ProjectLoader(array(__DIR__.'/../Fixtures/containers'));
         $this->assertEquals('/foo.xml', $loader->getAbsolutePath('/foo.xml'), '->getAbsolutePath() return the path unmodified if it is already an absolute path');
         $this->assertEquals('c:\\\\foo.xml', $loader->getAbsolutePath('c:\\\\foo.xml'), '->getAbsolutePath() return the path unmodified if it is already an absolute path');
         $this->assertEquals('c:/foo.xml', $loader->getAbsolutePath('c:/foo.xml'), '->getAbsolutePath() return the path unmodified if it is already an absolute path');
@@ -41,7 +41,7 @@ public function testGetAbsolutePath()
 
         $this->assertEquals(__DIR__.DIRECTORY_SEPARATOR.'FileLoaderTest.php', $loader->getAbsolutePath('FileLoaderTest.php', __DIR__), '->getAbsolutePath() returns an absolute filename if the file exists in the current path');
 
-        $this->assertEquals(__DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/containers'.DIRECTORY_SEPARATOR.'container10.php', $loader->getAbsolutePath('container10.php', __DIR__), '->getAbsolutePath() returns an absolute filename if the file exists in one of the paths given in the constructor');
+        $this->assertEquals(__DIR__.'/../Fixtures/containers'.DIRECTORY_SEPARATOR.'container10.php', $loader->getAbsolutePath('container10.php', __DIR__), '->getAbsolutePath() returns an absolute filename if the file exists in one of the paths given in the constructor');
 
         $this->assertEquals('foo.xml', $loader->getAbsolutePath('foo.xml', __DIR__), '->getAbsolutePath() returns the path unmodified if it is unable to find it in the given paths');
     }
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/Loader/IniFileLoaderTest.php b/tests/Symfony/Tests/Components/DependencyInjection/Loader/IniFileLoaderTest.php
index aaf761dd8781..20d3f0732e0f 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/Loader/IniFileLoaderTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/Loader/IniFileLoaderTest.php
@@ -19,7 +19,7 @@ class IniFileLoaderTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = realpath(__DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/');
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
     }
 
     /**
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderExtensionTest.php b/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderExtensionTest.php
index 9a3fa9f7d4f0..b42b7401af37 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderExtensionTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderExtensionTest.php
@@ -10,7 +10,7 @@
 
 namespace Symfony\Tests\Components\DependencyInjection\Loader;
 
-require_once __DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/includes/ProjectExtension.php';
+require_once __DIR__.'/../Fixtures/includes/ProjectExtension.php';
 
 use Symfony\Components\DependencyInjection\BuilderConfiguration;
 
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderTest.php b/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderTest.php
index 97473534001a..3194e53cd803 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderTest.php
@@ -10,7 +10,7 @@
 
 namespace Symfony\Tests\Components\DependencyInjection\Loader;
 
-require_once __DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/includes/ProjectExtension.php';
+require_once __DIR__.'/../Fixtures/includes/ProjectExtension.php';
 
 use Symfony\Components\DependencyInjection\Loader\Loader;
 use Symfony\Components\DependencyInjection\BuilderConfiguration;
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/Loader/XmlFileLoaderTest.php b/tests/Symfony/Tests/Components/DependencyInjection/Loader/XmlFileLoaderTest.php
index 3249eae30ef0..bc2856c0884b 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/Loader/XmlFileLoaderTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/Loader/XmlFileLoaderTest.php
@@ -22,7 +22,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = realpath(__DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/');
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
         require_once self::$fixturesPath.'/includes/ProjectExtension.php';
     }
 
diff --git a/tests/Symfony/Tests/Components/DependencyInjection/Loader/YamlFileLoaderTest.php b/tests/Symfony/Tests/Components/DependencyInjection/Loader/YamlFileLoaderTest.php
index 666c96b47211..7f26cd16084d 100644
--- a/tests/Symfony/Tests/Components/DependencyInjection/Loader/YamlFileLoaderTest.php
+++ b/tests/Symfony/Tests/Components/DependencyInjection/Loader/YamlFileLoaderTest.php
@@ -22,7 +22,7 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = realpath(__DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/');
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
         require_once self::$fixturesPath.'/includes/ProjectExtension.php';
     }
 
diff --git a/tests/Symfony/Tests/Components/Templating/EngineTest.php b/tests/Symfony/Tests/Components/Templating/EngineTest.php
index a6b3751da015..cf927fbc6091 100644
--- a/tests/Symfony/Tests/Components/Templating/EngineTest.php
+++ b/tests/Symfony/Tests/Components/Templating/EngineTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Tests\Components\Templating;
 
-require_once __DIR__.'/../../../../lib/SymfonyTests/Components/Templating/SimpleHelper.php';
+require_once __DIR__.'/Fixtures/SimpleHelper.php';
 
 use Symfony\Components\Templating\Engine;
 use Symfony\Components\Templating\Loader\Loader;
diff --git a/tests/lib/SymfonyTests/Components/Templating/ProjectTemplateDebugger.php b/tests/Symfony/Tests/Components/Templating/Fixtures/ProjectTemplateDebugger.php
similarity index 100%
rename from tests/lib/SymfonyTests/Components/Templating/ProjectTemplateDebugger.php
rename to tests/Symfony/Tests/Components/Templating/Fixtures/ProjectTemplateDebugger.php
diff --git a/tests/lib/SymfonyTests/Components/Templating/SimpleHelper.php b/tests/Symfony/Tests/Components/Templating/Fixtures/SimpleHelper.php
similarity index 100%
rename from tests/lib/SymfonyTests/Components/Templating/SimpleHelper.php
rename to tests/Symfony/Tests/Components/Templating/Fixtures/SimpleHelper.php
diff --git a/tests/fixtures/Symfony/Components/Templating/templates/foo.php b/tests/Symfony/Tests/Components/Templating/Fixtures/templates/foo.php
similarity index 100%
rename from tests/fixtures/Symfony/Components/Templating/templates/foo.php
rename to tests/Symfony/Tests/Components/Templating/Fixtures/templates/foo.php
diff --git a/tests/Symfony/Tests/Components/Templating/Loader/CacheLoaderTest.php b/tests/Symfony/Tests/Components/Templating/Loader/CacheLoaderTest.php
index 8db69003de49..41244bfe132a 100644
--- a/tests/Symfony/Tests/Components/Templating/Loader/CacheLoaderTest.php
+++ b/tests/Symfony/Tests/Components/Templating/Loader/CacheLoaderTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Tests\Components\Templating\Loader;
 
-require_once __DIR__.'/../../../../../lib/SymfonyTests/Components/Templating/ProjectTemplateDebugger.php';
+require_once __DIR__.'/../Fixtures/ProjectTemplateDebugger.php';
 
 use Symfony\Components\Templating\Loader\Loader;
 use Symfony\Components\Templating\Loader\CacheLoader;
diff --git a/tests/Symfony/Tests/Components/Templating/Loader/ChainLoaderTest.php b/tests/Symfony/Tests/Components/Templating/Loader/ChainLoaderTest.php
index 2511fe1cf0d4..3b47816612a0 100644
--- a/tests/Symfony/Tests/Components/Templating/Loader/ChainLoaderTest.php
+++ b/tests/Symfony/Tests/Components/Templating/Loader/ChainLoaderTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Tests\Components\Templating\Loader;
 
-require_once __DIR__.'/../../../../../lib/SymfonyTests/Components/Templating/ProjectTemplateDebugger.php';
+require_once __DIR__.'/../Fixtures/ProjectTemplateDebugger.php';
 
 use Symfony\Components\Templating\Loader\ChainLoader;
 use Symfony\Components\Templating\Loader\FilesystemLoader;
@@ -23,7 +23,7 @@ class ChainLoaderTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        $fixturesPath = realpath(__DIR__.'/../../../../../fixtures/Symfony/Components/Templating/');
+        $fixturesPath = realpath(__DIR__.'/../Fixtures/');
         self::$loader1 = new FilesystemLoader($fixturesPath.'/null/%name%');
         self::$loader2 = new FilesystemLoader($fixturesPath.'/templates/%name%.%renderer%');
     }
diff --git a/tests/Symfony/Tests/Components/Templating/Loader/FilesystemLoaderTest.php b/tests/Symfony/Tests/Components/Templating/Loader/FilesystemLoaderTest.php
index 2b12e6827836..4aea3ef05479 100644
--- a/tests/Symfony/Tests/Components/Templating/Loader/FilesystemLoaderTest.php
+++ b/tests/Symfony/Tests/Components/Templating/Loader/FilesystemLoaderTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Tests\Components\Templating\Loader;
 
-require_once __DIR__.'/../../../../../lib/SymfonyTests/Components/Templating/ProjectTemplateDebugger.php';
+require_once __DIR__.'/../Fixtures/ProjectTemplateDebugger.php';
 
 use Symfony\Components\Templating\Loader\FilesystemLoader;
 use Symfony\Components\Templating\Storage\FileStorage;
@@ -22,7 +22,7 @@ class FilesystemLoaderTest extends \PHPUnit_Framework_TestCase
 
     static public function setUpBeforeClass()
     {
-        self::$fixturesPath = realpath(__DIR__.'/../../../../../fixtures/Symfony/Components/Templating/');
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
     }
 
     public function testConstructor()
diff --git a/tests/Symfony/Tests/Components/Templating/Loader/LoaderTest.php b/tests/Symfony/Tests/Components/Templating/Loader/LoaderTest.php
index 33761fb077ef..b1ff651b31fe 100644
--- a/tests/Symfony/Tests/Components/Templating/Loader/LoaderTest.php
+++ b/tests/Symfony/Tests/Components/Templating/Loader/LoaderTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Tests\Components\Templating\Loader;
 
-require_once __DIR__.'/../../../../../lib/SymfonyTests/Components/Templating/ProjectTemplateDebugger.php';
+require_once __DIR__.'/../Fixtures/ProjectTemplateDebugger.php';
 
 use Symfony\Components\Templating\Loader\Loader;
 
diff --git a/tests/Symfony/Tests/Components/Templating/Renderer/PhpRendererTest.php b/tests/Symfony/Tests/Components/Templating/Renderer/PhpRendererTest.php
index 7ea9769b0706..32a44ad76cce 100644
--- a/tests/Symfony/Tests/Components/Templating/Renderer/PhpRendererTest.php
+++ b/tests/Symfony/Tests/Components/Templating/Renderer/PhpRendererTest.php
@@ -25,7 +25,7 @@ public function testEvaluate()
         $template = new StringStorage('<?php echo $foo ?>');
         $this->assertEquals('bar', $renderer->evaluate($template, array('foo' => 'bar')), '->evaluate() renders templates that are instances of StringStorage');
 
-        $template = new FileStorage(__DIR__.'/../../../../../fixtures/Symfony/Components/Templating/templates/foo.php');
+        $template = new FileStorage(__DIR__.'/../Fixtures/templates/foo.php');
         $this->assertEquals('bar', $renderer->evaluate($template, array('foo' => 'bar')), '->evaluate() renders templates that are instances of FileStorage');
     }
 }
diff --git a/tests/Symfony/Tests/Components/Templating/Renderer/RendererTest.php b/tests/Symfony/Tests/Components/Templating/Renderer/RendererTest.php
index 4e711f680422..86f2236420be 100644
--- a/tests/Symfony/Tests/Components/Templating/Renderer/RendererTest.php
+++ b/tests/Symfony/Tests/Components/Templating/Renderer/RendererTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Tests\Components\Templating\Renderer;
 
-require_once __DIR__.'/../../../../../lib/SymfonyTests/Components/Templating/SimpleHelper.php';
+require_once __DIR__.'/../Fixtures/SimpleHelper.php';
 
 use Symfony\Components\Templating\Engine;
 use Symfony\Components\Templating\Renderer\Renderer;
@@ -22,7 +22,7 @@ class RendererTest extends \PHPUnit_Framework_TestCase
 {
     public function testSetEngine()
     {
-        $loader = new FilesystemLoader(array(__DIR__.'/fixtures/templates/%name%.%renderer%'));
+        $loader = new FilesystemLoader(array(__DIR__.'/../Fixtures/templates/%name%.%renderer%'));
         $engine = new Engine($loader);
         $renderer = new ProjectTemplateRenderer();
         $renderer->setEngine($engine);
diff --git a/tests/Symfony/Tests/Components/Templating/Storage/FileStorageTest.php b/tests/Symfony/Tests/Components/Templating/Storage/FileStorageTest.php
index a45a9fbb9776..98b84084aaf3 100644
--- a/tests/Symfony/Tests/Components/Templating/Storage/FileStorageTest.php
+++ b/tests/Symfony/Tests/Components/Templating/Storage/FileStorageTest.php
@@ -20,7 +20,7 @@ public function testGetContent()
     {
         $storage = new FileStorage('foo');
         $this->assertInstanceOf('Symfony\Components\Templating\Storage\Storage', $storage, 'FileStorage is an instance of Storage');
-        $storage = new FileStorage(__DIR__.'/../../../../../fixtures/Symfony/Components/Templating/templates/foo.php');
+        $storage = new FileStorage(__DIR__.'/../Fixtures/templates/foo.php');
         $this->assertEquals('<?php echo $foo ?>', $storage->getContent(), '->getContent() returns the content of the template');
     }
 }
diff --git a/tests/Symfony/Tests/Components/Yaml/DumperTest.php b/tests/Symfony/Tests/Components/Yaml/DumperTest.php
index a0ecfb3f38b6..9a0692512397 100644
--- a/tests/Symfony/Tests/Components/Yaml/DumperTest.php
+++ b/tests/Symfony/Tests/Components/Yaml/DumperTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Components\OutputEscaper;
+namespace Symfony\Tests\Components\Yaml;
 
 use Symfony\Components\Yaml\Yaml;
 use Symfony\Components\Yaml\Parser;
@@ -29,7 +29,7 @@ public function setUp()
     {
         $this->parser = new Parser();
         $this->dumper = new Dumper();
-        $this->path = __DIR__.'/../../../../fixtures/Symfony/Components/Yaml';
+        $this->path = __DIR__.'/Fixtures';
     }
 
     public function testSpecifications()
@@ -153,7 +153,7 @@ public function testObjectsSupport()
     {
         $a = array('foo' => new A(), 'bar' => 1);
 
-        $this->assertEquals('{ foo: !!php/object:O:40:"Symfony\Tests\Components\OutputEscaper\A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', $this->dumper->dump($a), '->dump() is able to dump objects');
+        $this->assertEquals('{ foo: !!php/object:O:31:"Symfony\Tests\Components\Yaml\A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', $this->dumper->dump($a), '->dump() is able to dump objects');
     }
 }
 
diff --git a/tests/fixtures/Symfony/Components/Yaml/YtsAnchorAlias.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/YtsAnchorAlias.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/YtsAnchorAlias.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/YtsAnchorAlias.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/YtsBasicTests.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/YtsBasicTests.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/YtsBasicTests.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/YtsBasicTests.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/YtsBlockMapping.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/YtsBlockMapping.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/YtsBlockMapping.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/YtsBlockMapping.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/YtsDocumentSeparator.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/YtsDocumentSeparator.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/YtsDocumentSeparator.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/YtsDocumentSeparator.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/YtsErrorTests.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/YtsErrorTests.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/YtsErrorTests.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/YtsErrorTests.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/YtsFlowCollections.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/YtsFlowCollections.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/YtsFlowCollections.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/YtsFlowCollections.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/YtsFoldedScalars.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/YtsFoldedScalars.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/YtsFoldedScalars.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/YtsFoldedScalars.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/YtsNullsAndEmpties.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/YtsNullsAndEmpties.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/YtsNullsAndEmpties.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/YtsNullsAndEmpties.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/YtsSpecificationExamples.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/YtsSpecificationExamples.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/YtsSpecificationExamples.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/YtsSpecificationExamples.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/YtsTypeTransfers.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/YtsTypeTransfers.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/YtsTypeTransfers.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/YtsTypeTransfers.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/index.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/index.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/index.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/index.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/sfComments.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/sfComments.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/sfComments.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/sfComments.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/sfCompact.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/sfCompact.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/sfCompact.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/sfCompact.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/sfMergeKey.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/sfMergeKey.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/sfMergeKey.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/sfMergeKey.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/sfObjects.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/sfObjects.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/sfObjects.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/sfObjects.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/sfQuotes.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/sfQuotes.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/sfQuotes.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/sfQuotes.yml
diff --git a/tests/fixtures/Symfony/Components/Yaml/sfTests.yml b/tests/Symfony/Tests/Components/Yaml/Fixtures/sfTests.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/Yaml/sfTests.yml
rename to tests/Symfony/Tests/Components/Yaml/Fixtures/sfTests.yml
diff --git a/tests/Symfony/Tests/Components/Yaml/InlineTest.php b/tests/Symfony/Tests/Components/Yaml/InlineTest.php
index 2cc77c56f12b..e9ead886e9fa 100644
--- a/tests/Symfony/Tests/Components/Yaml/InlineTest.php
+++ b/tests/Symfony/Tests/Components/Yaml/InlineTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Components\OutputEscaper;
+namespace Symfony\Tests\Components\Yaml;
 
 use Symfony\Components\Yaml\Yaml;
 use Symfony\Components\Yaml\Inline;
diff --git a/tests/Symfony/Tests/Components/Yaml/ParserTest.php b/tests/Symfony/Tests/Components/Yaml/ParserTest.php
index bbb97ad62283..c7976dd5dc81 100644
--- a/tests/Symfony/Tests/Components/Yaml/ParserTest.php
+++ b/tests/Symfony/Tests/Components/Yaml/ParserTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Components\OutputEscaper;
+namespace Symfony\Tests\Components\Yaml;
 
 use Symfony\Components\Yaml\Yaml;
 use Symfony\Components\Yaml\Parser;
@@ -27,7 +27,7 @@ static public function setUpBeforeClass()
     public function setUp()
     {
         $this->parser = new Parser();
-        $this->path = __DIR__.'/../../../../fixtures/Symfony/Components/Yaml';
+        $this->path = __DIR__.'/Fixtures';
     }
 
     public function testSpecifications()
@@ -80,7 +80,7 @@ public function testObjectsSupport()
     {
         $b = array('foo' => new B(), 'bar' => 1);
         $this->assertEquals($this->parser->parse(<<<EOF
-foo: !!php/object:O:40:"Symfony\Tests\Components\OutputEscaper\B":1:{s:1:"b";s:3:"foo";}
+foo: !!php/object:O:31:"Symfony\Tests\Components\Yaml\B":1:{s:1:"b";s:3:"foo";}
 bar: 1
 EOF
         ), $b, '->parse() is able to dump objects');