diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/serializer.xml b/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml
similarity index 57%
rename from src/Symfony/Component/Serializer/Tests/Fixtures/serializer.xml
rename to src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml
index c8c1e887be..6e95aaf721 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/serializer.xml
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" ?>
 
-<serializer xmlns="http://symfony.com/schema/dic/serializer"
+<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                    xsi:schemaLocation="http://symfony.com/schema/dic/serializer http://symfony.com/schema/dic/constraint-mapping/serializer-1.0.xsd">
+                    xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd">
 
     <class name="Symfony\Component\Serializer\Tests\Fixtures\GroupDummy">
         <attribute name="foo">
-            <group name="group1" />
-            <group name="group2" />
+            <group>group1</group>
+            <group>group2</group>
         </attribute>
 
         <attribute name="bar">
-            <group name="group2" />
+            <group>group2</group>
         </attribute>
     </class>
 
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/serializer.yml b/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.yml
similarity index 100%
rename from src/Symfony/Component/Serializer/Tests/Fixtures/serializer.yml
rename to src/Symfony/Component/Serializer/Tests/Fixtures/serialization.yml
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php
index f45a2f0eeb..35888626e0 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -25,7 +25,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->loader = new XmlFileLoader(__DIR__.'/../../Fixtures/serializer.xml');
+        $this->loader = new XmlFileLoader(__DIR__.'/../../Fixtures/serialization.xml');
         $this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');
     }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
index 6eec425563..ec6434cf1d 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -25,7 +25,7 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->loader = new YamlFileLoader(__DIR__.'/../../Fixtures/serializer.yml');
+        $this->loader = new YamlFileLoader(__DIR__.'/../../Fixtures/serialization.yml');
         $this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');
     }