diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 6e1577609..d1aa71bdf 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="Tests/bootstrap.php"
->
+<phpunit bootstrap="./Tests/bootstrap.php" color="true">
+
     <testsuites>
-        <testsuite name="LiipImagineBundle Test Suite">
-            <directory>./Tests/</directory>
+        <testsuite name="LiipImagineBundle test suite">
+            <directory suffix="Test.php">./Tests</directory>
         </testsuite>
     </testsuites>
 
@@ -26,5 +17,4 @@
             </exclude>
         </whitelist>
     </filter>
-
 </phpunit>
diff --git a/vendor/vendors.php b/vendor/vendors.php
index b3a0a1189..a74c5af08 100644
--- a/vendor/vendors.php
+++ b/vendor/vendors.php
@@ -3,10 +3,7 @@
 
 set_time_limit(0);
 
-if (!is_dir($vendorDir = __DIR__)) {
-    mkdir($vendorDir, 0777, true);
-}
-
+$vendorDir = __DIR__;
 $deps = array(
     array('symfony', 'http://github.com/symfony/symfony', 'v2.0.5'),
     array('imagine', 'http://github.com/avalanche123/Imagine', 'v0.2.6'),