diff --git a/Tests/ServiceBinding/RpcLiteralRequestMessageBinderTest.php b/Tests/ServiceBinding/RpcLiteralRequestMessageBinderTest.php
index d1e9786..966edf8 100644
--- a/Tests/ServiceBinding/RpcLiteralRequestMessageBinderTest.php
+++ b/Tests/ServiceBinding/RpcLiteralRequestMessageBinderTest.php
@@ -1,8 +1,10 @@
 <?php
+
 /*
  * This file is part of the BeSimpleSoapBundle.
  *
  * (c) Christian Kerl <christian-kerl@web.de>
+ * (c) Francis Besset <francis.besset@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.
diff --git a/Tests/ServiceBinding/fixtures/Attributes.php b/Tests/ServiceBinding/fixtures/Attributes.php
index 53d4aee..1626464 100644
--- a/Tests/ServiceBinding/fixtures/Attributes.php
+++ b/Tests/ServiceBinding/fixtures/Attributes.php
@@ -5,5 +5,6 @@ namespace BeSimple\SoapBundle\Tests\ServiceBinding\fixtures;
 class Attributes
 {
     public $foo;
+
     public $bar;
-}
\ No newline at end of file
+}
diff --git a/Tests/ServiceBinding/fixtures/ComplexType.php b/Tests/ServiceBinding/fixtures/ComplexType.php
index 2bbabd0..f5c3332 100644
--- a/Tests/ServiceBinding/fixtures/ComplexType.php
+++ b/Tests/ServiceBinding/fixtures/ComplexType.php
@@ -17,4 +17,4 @@ class ComplexType
     {
         $this->foo = $foo;
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/ServiceBinding/fixtures/Setters.php b/Tests/ServiceBinding/fixtures/Setters.php
index a8de35a..73a16d1 100644
--- a/Tests/ServiceBinding/fixtures/Setters.php
+++ b/Tests/ServiceBinding/fixtures/Setters.php
@@ -5,6 +5,7 @@ namespace BeSimple\SoapBundle\Tests\ServiceBinding\fixtures;
 class Setters
 {
     private $foo;
+
     private $bar;
 
     public function getFoo()
@@ -26,4 +27,4 @@ class Setters
     {
         $this->bar = $bar;
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/Soap/SoapRequestTest.php b/Tests/Soap/SoapRequestTest.php
index f95b034..58f3404 100644
--- a/Tests/Soap/SoapRequestTest.php
+++ b/Tests/Soap/SoapRequestTest.php
@@ -1,8 +1,10 @@
 <?php
+
 /*
  * This file is part of the BeSimpleSoapBundle.
  *
  * (c) Christian Kerl <christian-kerl@web.de>
+ * (c) Francis Besset <francis.besset@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
deleted file mode 100644
index 4d7062a..0000000
--- a/Tests/bootstrap.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-require_once $_SERVER['SYMFONY'].'/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-
-use Symfony\Component\ClassLoader\UniversalClassLoader;
-
-$loader = new UniversalClassLoader();
-$loader->registerNamespace('Symfony', $_SERVER['SYMFONY']);
-$loader->registerNamespace('Zend', $_SERVER['ZEND']);
-$loader->register();
-
-spl_autoload_register(function($class) {
-    //if (0 === strpos($class, 'BeSimple\\SoapBundle\\')) {
-    if (0 === strpos($class, 'BeSimple\\SoapBundle\\')) {
-        $path = __DIR__.'/../'.implode('/', array_slice(explode('\\', $class), 2)).'.php';
-
-        if (file_exists($path)) {
-            require_once $path;
-
-            return true;
-        }
-
-        return false;
-    }
-});
diff --git a/Tests/fixtures/ServiceBinding/Bar.php b/Tests/fixtures/ServiceBinding/Bar.php
index fac87cb..d837ae9 100644
--- a/Tests/fixtures/ServiceBinding/Bar.php
+++ b/Tests/fixtures/ServiceBinding/Bar.php
@@ -5,6 +5,7 @@ namespace BeSimple\SoapBundle\Tests\fixtures\ServiceBinding;
 class Bar
 {
     private $foo;
+
     private $bar;
 
     public function __construct($foo, $bar)
@@ -12,4 +13,4 @@ class Bar
         $this->foo = $foo;
         $this->bar = $bar;
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/fixtures/ServiceBinding/BarRecursive.php b/Tests/fixtures/ServiceBinding/BarRecursive.php
index c7d3d14..1344fa3 100644
--- a/Tests/fixtures/ServiceBinding/BarRecursive.php
+++ b/Tests/fixtures/ServiceBinding/BarRecursive.php
@@ -10,4 +10,4 @@ class BarRecursive
     {
         $this->foo = $foo;
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/fixtures/ServiceBinding/Foo.php b/Tests/fixtures/ServiceBinding/Foo.php
index e635b8e..bfac544 100644
--- a/Tests/fixtures/ServiceBinding/Foo.php
+++ b/Tests/fixtures/ServiceBinding/Foo.php
@@ -12,4 +12,4 @@ class Foo
         $this->foo = $foo;
         $this->bar = $bar;
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/fixtures/ServiceBinding/FooBar.php b/Tests/fixtures/ServiceBinding/FooBar.php
index 103dfc9..f1b847b 100644
--- a/Tests/fixtures/ServiceBinding/FooBar.php
+++ b/Tests/fixtures/ServiceBinding/FooBar.php
@@ -12,4 +12,4 @@ class FooBar
         $this->foo = $foo;
         $this->bar = $bar;
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/fixtures/ServiceBinding/FooRecursive.php b/Tests/fixtures/ServiceBinding/FooRecursive.php
index b39c9f1..5ae9688 100644
--- a/Tests/fixtures/ServiceBinding/FooRecursive.php
+++ b/Tests/fixtures/ServiceBinding/FooRecursive.php
@@ -5,4 +5,4 @@ namespace BeSimple\SoapBundle\Tests\fixtures\ServiceBinding;
 class FooRecursive
 {
     public $bar;
-}
\ No newline at end of file
+}
diff --git a/Tests/fixtures/ServiceBinding/SimpleArrays.php b/Tests/fixtures/ServiceBinding/SimpleArrays.php
index e17a640..2c1dba7 100644
--- a/Tests/fixtures/ServiceBinding/SimpleArrays.php
+++ b/Tests/fixtures/ServiceBinding/SimpleArrays.php
@@ -7,6 +7,7 @@ class SimpleArrays
     public $array1;
 
     private $array2;
+
     private $array3;
 
     public function __construct($array1, $array2, $array3)
diff --git a/composer.json b/composer.json
index dc688dd..aa790a2 100644
--- a/composer.json
+++ b/composer.json
@@ -22,8 +22,11 @@
     "require": {
         "php": ">=5.3.0",
         "besimple/soap-common": "dev-master",
+        "ass/xmlsecurity": "dev-master",
         "zendframework/zend-soap": "2.1.1",
-        "zendframework/zend-mime": "2.1.1"
+        "zendframework/zend-mime": "2.1.1",
+        "zendframework/zend-mail": "2.1.1",
+        "symfony/http-foundation": ">=2.0,<2.3-dev"
     },
     "suggest": {
         "besimple/soap-client": "dev-master",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c40be1e..2db5db8 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,16 +9,13 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="Tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
-    <php>
-        <server name="SYMFONY" value="./vendor/symfony/src" />
-        <server name="ZEND" value="./vendor/zend-framework/library" />
-    </php>
 
     <testsuites>
         <testsuite name="SoapBundle Test Suite">
             <directory>./Tests</directory>
         </testsuite>
     </testsuites>
+
 </phpunit>