--- a/build.xml	Tue Aug 12 18:56:23 2014 +0000
+++ b/build.xml	Tue Aug 12 21:16:35 2014 +0200
@@ -12,7 +12,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2013 Openbravo SLU
+* All portions are Copyright (C) 2001-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -250,12 +250,14 @@
     </fileset>
     <fileset dir="${base.lib}">
       <include name="**/*.jar" />
+      <exclude name="**/test/*.jar" />
     </fileset>
     <fileset dir="${base.db}/lib/">
       <include name="**/*.jar" />
     </fileset>
     <fileset dir="${base.modules}">
       <include name="*/lib/**" />
+       <exclude name="**/test/*.jar" />
     </fileset>
   </path>
 
@@ -575,20 +577,24 @@
     <ant dir="${base.src}" target="generate.entities.quick.forked" inheritAll="true" inheritRefs="true" />
   </target>
 
+  <target name="compile.test" depends="init">
+    <ant dir="${base.src.test}" target="compile.test" inheritAll="true" inheritRefs="true" />
+  </target>
+  
   <target name="run.tests" depends="init">
-    <ant dir="${base.src}" target="run.tests" inheritAll="true" inheritRefs="true" />
+    <ant dir="${base.src.test}" target="run.tests" inheritAll="true" inheritRefs="true" />
   </target>
 
   <target name="run.all.tests" depends="init">
-    <ant dir="${base.src}" target="run.all.tests" inheritAll="true" inheritRefs="true" />
+    <ant dir="${base.src.test}" target="run.all.tests" inheritAll="true" inheritRefs="true" />
   </target>
 
   <target name="run.webservice.tests" depends="init">
-      <ant dir="${base.src}" target="run.webservice.tests" inheritAll="true" inheritRefs="true" />
+      <ant dir="${base.src.test}" target="run.webservice.tests" inheritAll="true" inheritRefs="true" />
   </target>
 
   <target name="run.quick.tests" depends="init">
-    <ant dir="${base.src}" target="run.quick.tests" inheritAll="true" inheritRefs="true" />
+    <ant dir="${base.src.test}" target="run.quick.tests" inheritAll="true" inheritRefs="true" />
   </target>
 
   <target name="run.api.test.javascript">