diff --git a/build.xml b/build.xml
index b510c6e7b86..18dc95c341e 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,7 @@
 <project name="dolibarr" default="hudson" basedir=".">
 
 <!-- Exclude/ignore paths -->
- <property name="ignorepaths" value="${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes/adodbtime,${basedir}/htdocs/includes/artichow,${basedir}/htdocs/includes/barcode/php-barcode,${basedir}/htdocs/includes/ckeditor,${basedir}/htdocs/includes/fpdfi,${basedir}/htdocs/includes/geoip,${basedir}/htdocs/includes/jquery,${basedir}/htdocs/includes/jsgantt,${basedir}/htdocs/includes/nusoap,${basedir}/htdocs/includes/odtphp,${basedir}/htdocs/includes/phpexcel,${basedir}/htdocs/includes/tcpdf" />
+ <property name="ignorepaths" value="${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
  <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*" />
  
  <target name="clean">
@@ -44,18 +44,7 @@
   <exec executable="phpcpd">
    <arg line="	--log-pmd '${basedir}/hudson/logs/pmd-cpd.xml'
    				--exclude '${basedir}/htdocs/core/filemanagerdol'
-   				--exclude '${basedir}/htdocs/includes/adodbtime'
-   				--exclude '${basedir}/htdocs/includes/artichow'
-   				--exclude '${basedir}/htdocs/includes/barcode/php-barcode'
-   				--exclude '${basedir}/htdocs/includes/ckeditor'
-   				--exclude '${basedir}/htdocs/includes/fpdfi'
-   				--exclude '${basedir}/htdocs/includes/geoip'
-   				--exclude '${basedir}/htdocs/includes/jquery'
-   				--exclude '${basedir}/htdocs/includes/jsgantt'
-   				--exclude '${basedir}/htdocs/includes/nusoap'
-   				--exclude '${basedir}/htdocs/includes/odtphp'
-   				--exclude '${basedir}/htdocs/includes/phpexcel'
-   				--exclude '${basedir}/htdocs/includes/tcpdf'
+   				--exclude '${basedir}/htdocs/includes'
    				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
    				htdocs
    				" />
@@ -67,18 +56,7 @@
   <exec executable="phploc">
    <arg line="	--log-csv '${basedir}/hudson/logs/phploc.csv'
    				--exclude '${basedir}/htdocs/core/filemanagerdol'
-   				--exclude '${basedir}/htdocs/includes/adodbtime'
-   				--exclude '${basedir}/htdocs/includes/artichow'
-   				--exclude '${basedir}/htdocs/includes/barcode/php-barcode'
-   				--exclude '${basedir}/htdocs/includes/ckeditor'
-   				--exclude '${basedir}/htdocs/includes/fpdfi'
-   				--exclude '${basedir}/htdocs/includes/geoip'
-   				--exclude '${basedir}/htdocs/includes/jquery'
-   				--exclude '${basedir}/htdocs/includes/jsgantt'
-   				--exclude '${basedir}/htdocs/includes/nusoap'
-   				--exclude '${basedir}/htdocs/includes/odtphp'
-   				--exclude '${basedir}/htdocs/includes/phpexcel'
-   				--exclude '${basedir}/htdocs/includes/tcpdf'
+   				--exclude '${basedir}/htdocs/includes'
    				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
    				htdocs
    				" />
diff --git a/test/phpunit/hudson_phpunittest.xml b/test/phpunit/hudson_phpunittest.xml
index ccd0561976f..8706b4f12fd 100644
--- a/test/phpunit/hudson_phpunittest.xml
+++ b/test/phpunit/hudson_phpunittest.xml
@@ -17,23 +17,12 @@
     <directory suffix=".php">../../doc/</directory>
     <directory suffix=".php">../../test/</directory>
     <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/products/canvas/</directory>
     <directory suffix=".php">../../htdocs/contact/canvas/</directory>
     <directory suffix=".php">../../htdocs/societe/canvas/</directory>
-    <directory suffix=".php">../../htdocs/includes/adodbtime/</directory>
-    <directory suffix=".php">../../htdocs/includes/artichow/</directory>
-    <directory suffix=".php">../../htdocs/includes/barcode/php-barcode/</directory>
-    <directory suffix=".php">../../htdocs/includes/ckeditor/</directory>
-    <directory suffix=".php">../../htdocs/includes/fpdfi/</directory>
-    <directory suffix=".php">../../htdocs/includes/geoip/</directory>
-    <directory suffix=".php">../../htdocs/includes/jquery/</directory>
-    <directory suffix=".php">../../htdocs/includes/jsgantt/</directory>
-    <directory suffix=".php">../../htdocs/core/menus/smartphone/</directory>
-    <directory suffix=".php">../../htdocs/includes/nusoap/</directory>
-    <directory suffix=".php">../../htdocs/includes/odtphp/</directory>
-    <directory suffix=".php">../../htdocs/includes/phpexcel/</directory>
-    <directory suffix=".php">../../htdocs/includes/tcpdf/</directory>
+    <directory suffix=".php">../../htdocs/includes/</directory>
   </blacklist>
   <whitelist addUncoveredFilesFromWhitelist="true">
     <directory suffix=".class.php">../../htdocs/</directory>
@@ -55,23 +44,12 @@
     <directory suffix=".inc.php">../../htdocs/compta/bank/</directory>
     <directory suffix=".inc.php">../../htdocs/ftp/</directory>
     <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/products/canvas/</directory>
     <directory suffix=".php">../../htdocs/contact/canvas/</directory>
     <directory suffix=".php">../../htdocs/societe/canvas/</directory>
-    <directory suffix=".php">../../htdocs/includes/adodbtime/</directory>
-    <directory suffix=".php">../../htdocs/includes/artichow/</directory>
-    <directory suffix=".php">../../htdocs/includes/barcode/php-barcode/</directory>
-    <directory suffix=".php">../../htdocs/includes/ckeditor/</directory>
-    <directory suffix=".php">../../htdocs/includes/fpdfi/</directory>
-    <directory suffix=".php">../../htdocs/includes/geoip/</directory>
-    <directory suffix=".php">../../htdocs/includes/jquery/</directory>
-    <directory suffix=".php">../../htdocs/includes/jsgantt/</directory>
-    <directory suffix=".php">../../htdocs/core/menus/smartphone</directory>
-    <directory suffix=".php">../../htdocs/includes/nusoap/</directory>
-    <directory suffix=".php">../../htdocs/includes/odtphp/</directory>
-    <directory suffix=".php">../../htdocs/includes/phpexcel/</directory>
-    <directory suffix=".php">../../htdocs/includes/tcpdf/</directory>
+    <directory suffix=".php">../../htdocs/includes/</directory>
     </exclude>
   </whitelist>
 </filter>