diff --git a/Resources/config/serializer.xml b/Resources/config/serializer.xml
index 13663d2..8dd8c44 100644
--- a/Resources/config/serializer.xml
+++ b/Resources/config/serializer.xml
@@ -15,8 +15,9 @@
         <service id="misd_guzzle.request.visitor.body" class="%misd_guzzle.request.visitor.body.class%">
             <argument type="service" id="jms_serializer.serializer" on-invalid="ignore"/>
         </service>
-        <service id="misd_guzzle.response.parser.fallback" class="%misd_guzzle.response.parser.fallback.class%"
-                 factory-class="%misd_guzzle.response.parser.fallback.class%" factory-method="getInstance"/>
+        <service id="misd_guzzle.response.parser.fallback" class="%misd_guzzle.response.parser.fallback.class%">
+             <factory class="%misd_guzzle.response.parser.fallback.class%" method="getInstance"/>
+        </service>
         <service id="misd_guzzle.response.parser" class="%misd_guzzle.response.parser.class%">
             <argument type="service" id="jms_serializer.serializer" on-invalid="ignore"/>
             <argument type="service" id="misd_guzzle.response.parser.fallback"/>
diff --git a/Resources/config/service_builder.xml b/Resources/config/service_builder.xml
index 2831ca3..f9d1c96 100644
--- a/Resources/config/service_builder.xml
+++ b/Resources/config/service_builder.xml
@@ -9,8 +9,8 @@
     </parameters>
 
     <services>
-        <service id="guzzle.service_builder" class="%guzzle.service_builder.class%"
-                 factory-class="%guzzle.service_builder.class%" factory-method="factory">
+        <service id="guzzle.service_builder" class="%guzzle.service_builder.class%">
+            <factory class="%guzzle.service_builder.class%" method="factory"/>
             <argument type="string" id="guzzle.service_builder.configuration_file">%guzzle.service_builder.configuration_file%</argument>
         </service>
     </services>
diff --git a/Tests/Functional/app/AppKernel.php b/Tests/Functional/app/AppKernel.php
index c100925..a15d0d0 100644
--- a/Tests/Functional/app/AppKernel.php
+++ b/Tests/Functional/app/AppKernel.php
@@ -53,10 +53,6 @@ public function registerBundles()
         return include $filename;
     }
 
-    public function init()
-    {
-    }
-
     public function getRootDir()
     {
         return __DIR__;