diff --git a/.gitignore b/.gitignore
index cfd602947..4333b69b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ log/*
 bin/*
 composer.lock
 local/session/*
+coverage
diff --git a/composer.json b/composer.json
index 94e9f93f4..3d55fa547 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "require":{
         "php": ">=5.4.0",
         "ircmaxell/password-compat": "dev-master",
-        "propel/propel1" : "1.6.*",
+        "propel/propel1" : "1.6.7",
         "psr/log" : "dev-master",
         "symfony/class-loader": "2.1.*",
         "symfony/config" : "2.1.*",
diff --git a/core/lib/Thelia/Tests/bootstrap.php b/core/lib/Thelia/Tests/bootstrap.php
index be2ad333d..161492aa3 100644
--- a/core/lib/Thelia/Tests/bootstrap.php
+++ b/core/lib/Thelia/Tests/bootstrap.php
@@ -7,7 +7,7 @@
  */
 $env = "test";
 define('THELIA_ROOT', __DIR__ .'/../../../../');
-$loader = require __DIR__ . '/../../../autoload.php';
+$loader = require __DIR__ . '/../../../vendor/autoload.php';
 
 require THELIA_ROOT . '/local/config/config_db.php';
 
diff --git a/phpunit.xml b/phpunit.xml
index 3326a6401..3f800493b 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,6 +2,9 @@
 
 <phpunit 
     colors="true"
+    convertErrorsToExceptions= "true"
+    convertNoticesToExceptions= "true"
+    convertWarningsToExceptions= "true"
     bootstrap="core/lib/Thelia/Tests/bootstrap.php"
     verbose="true"
     backupGlobals="false"
@@ -11,4 +14,14 @@
 	        <directory>core/lib/Thelia/Tests</directory>
 	    </testsuite>
     </testsuites>
+    <filter>
+        <whitelist>
+            <directory>core/lib</directory>
+            <exclude>
+                <directory>core/lib/Thelia/Model/map</directory>
+                <directory>core/lib/Thelia/Model/om</directory>
+                <directory>core/lib/Thelia/Tests</directory>
+            </exclude>
+        </whitelist>
+    </filter>
 </phpunit>