diff --git a/test/phpunit/jenkins_phpunittest.xml b/test/phpunit/jenkins_phpunittest.xml
index 8706b4f12fd..475a3972011 100644
--- a/test/phpunit/jenkins_phpunittest.xml
+++ b/test/phpunit/jenkins_phpunittest.xml
@@ -46,6 +46,7 @@
     <directory suffix=".php">../../htdocs/core/filemanagerdol/</directory>
     <directory suffix=".php">../../htdocs/core/menus/smartphone</directory>
     <directory suffix=".php">../../htdocs/custom/</directory>
+    <directory suffix=".php">../../htdocs/custom2/</directory>
     <directory suffix=".php">../../htdocs/products/canvas/</directory>
     <directory suffix=".php">../../htdocs/contact/canvas/</directory>
     <directory suffix=".php">../../htdocs/societe/canvas/</directory>
diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml
index 43c4093ae80..aed6a386c64 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -1,23 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE phpunit SYSTEM "phpunit.dtd" >
-<phpunit>
+<phpunit
+	backupGlobals="true"
+	backupStaticAttributes="false"
+	convertErrorsToExceptions="true"
+	convertNoticesToExceptions="true"
+	convertWarningsToExceptions="true"
+	colors="true"
+	processIsolation="false"
+	stopOnFailure="false"
+	syntaxCheck="true">
 <filter>
   <blacklist>
-    <directory suffix=".php">../CVS/</directory>
     <directory suffix=".php">../../build/</directory>
     <directory suffix=".php">../../dev/</directory>
     <directory suffix=".php">../../doc/</directory>
-    <directory suffix=".php">../../htdocs/CVS/</directory>
     <directory suffix=".php">../../test/</directory>
+    <directory suffix=".php">../../htdocs/core/menus/smartphone/</directory>
     <directory suffix=".php">../../htdocs/custom/</directory>
     <directory suffix=".php">../../htdocs/custom2/</directory>
-    <directory suffix=".php">../../htdocs/core/menus/smartphone/</directory>
     <directory suffix=".php">../../htdocs/products/canvas/</directory>
     <directory suffix=".php">../../htdocs/contact/canvas/</directory>
     <directory suffix=".php">../../htdocs/societe/canvas/</directory>
     <directory suffix=".php">../../htdocs/includes/</directory>
   </blacklist>
-  <whitelist>
+  <whitelist addUncoveredFilesFromWhitelist="true">
     <directory suffix=".class.php">../../htdocs/</directory>
     <directory suffix=".lib.php">../../htdocs/</directory>
     <directory suffix=".inc.php">../../htdocs/</directory>
@@ -28,15 +35,13 @@
     <file>../../htdocs/core/modules/project/modules_project.php</file>
     <file>../../htdocs/core/modules/fichinter/modules_fichinter.php</file>
     <exclude>
-    <directory suffix=".php">../CVS/</directory>
     <directory suffix=".php">../../build/</directory>
     <directory suffix=".php">../../dev/</directory>
     <directory suffix=".php">../../doc/</directory>
-    <directory suffix=".php">../../htdocs/CVS/</directory>
     <directory suffix=".php">../../test/</directory>
+    <directory suffix=".php">../../htdocs/core/menus/smartphone</directory>
     <directory suffix=".php">../../htdocs/custom/</directory>
     <directory suffix=".php">../../htdocs/custom2/</directory>
-    <directory suffix=".php">../../htdocs/core/menus/smartphone</directory>
     <directory suffix=".php">../../htdocs/products/canvas/</directory>
     <directory suffix=".php">../../htdocs/contact/canvas/</directory>
     <directory suffix=".php">../../htdocs/societe/canvas/</directory>