diff --git a/composer.json b/composer.json
index 9af4a30..afde016 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
     },
     "autoload": {
         "psr-0": {
-            "BeSimple\\SoapCommon": "BeSimple/SoapCommon/src/"
+            "BeSimple\\SoapCommon": "src/"
         }
     },
     "target-dir": "BeSimple/SoapCommon"
diff --git a/tests/BeSimple/Tests/SoapCommon/CacheTest.php b/tests/BeSimple/Tests/SoapCommon/CacheTest.php
index 602f894..79e936a 100644
--- a/tests/BeSimple/Tests/SoapCommon/CacheTest.php
+++ b/tests/BeSimple/Tests/SoapCommon/CacheTest.php
@@ -13,6 +13,8 @@
 namespace BeSimple\Tests\SoapCommon\Soap;
 
 use BeSimple\SoapCommon\Cache;
+use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamWrapper;
 
 class SoapRequestTest extends \PHPUnit_Framework_TestCase
 {
@@ -48,19 +50,19 @@ class SoapRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testSetDirectory()
     {
-        \vfsStream::setup('Fixtures');
+        vfsStream::setup('Fixtures');
 
-        $this->assertFalse(\vfsStreamWrapper::getRoot()->hasChild('foo'));
-        $dir = \vfsStream::url('Fixtures/foo');
+        $this->assertFalse(vfsStreamWrapper::getRoot()->hasChild('foo'));
+        $dir = vfsStream::url('Fixtures/foo');
         Cache::setDirectory($dir);
         $this->assertEquals($dir, Cache::getDirectory());
-        $this->assertTrue(\vfsStreamWrapper::getRoot()->hasChild('foo'));
+        $this->assertTrue(vfsStreamWrapper::getRoot()->hasChild('foo'));
 
-        $this->assertFalse(\vfsStreamWrapper::getRoot()->hasChild('bar'));
-        $dir = \vfsStream::url('Fixtures/bar');
+        $this->assertFalse(vfsStreamWrapper::getRoot()->hasChild('bar'));
+        $dir = vfsStream::url('Fixtures/bar');
         Cache::setDirectory($dir);
         $this->assertEquals($dir, Cache::getDirectory());
-        $this->assertTrue(\vfsStreamWrapper::getRoot()->hasChild('bar'));
+        $this->assertTrue(vfsStreamWrapper::getRoot()->hasChild('bar'));
     }
 
     public function testSetLifetime()
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 67150ad..008870c 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,36 +1,5 @@
 <?php
 
-error_reporting(E_ALL | E_STRICT);
+$loader = require __DIR__.'/../vendor/autoload.php';
 
-// register silently failing autoloader
-spl_autoload_register(function($class) {
-    if (0 === strpos($class, 'BeSimple\Tests\\')) {
-        $path = __DIR__.'/'.strtr($class, '\\', '/').'.php';
-        if (file_exists($path) && is_readable($path)) {
-            require_once $path;
-
-            return true;
-        }
-    } elseif (0 === strpos($class, 'BeSimple\SoapCommon\\')) {
-        $path = __DIR__.'/../src/'.strtr($class, '\\', '/').'.php';
-        if (file_exists($path) && is_readable($path)) {
-            require_once $path;
-
-            return true;
-        }
-    } elseif (0 === strpos($class, 'ass\XmlSecurity\\')) {
-        $path = __DIR__.'/../vendor/XmlSecurity/src/'.strtr($class, '\\', '/').'.php';
-        if (file_exists($path) && is_readable($path)) {
-            require_once $path;
-
-            return true;
-        }
-    } elseif (0 === strpos($class, 'vfsStream')) {
-        $path = __DIR__.'/../vendor/vfsStream/src/main/php/org/bovigo/vfs/'.$class.'.php';
-        if (file_exists($path) && is_readable($path)) {
-            require_once $path;
-
-            return true;
-        }
-    }
-});
\ No newline at end of file
+$loader->add('BeSimple\Tests\SoapCommon\\', __DIR__);