diff --git a/org.intrace/build.xml b/org.intrace/build.xml
index 4b48cec..c3453d6 100644
--- a/org.intrace/build.xml
+++ b/org.intrace/build.xml
@@ -174,7 +174,7 @@
       <zipfileset excludes="META-INF/*.MF" src="./lib/asm-debug-all-3.3.jar"/>
     </jar>
 
-    <junit printsummary="yes" haltonfailure="yes">
+    <junit printsummary="yes" failureproperty="test.failure">
       <classpath>
         <pathelement location="./build/test"/>        
         <fileset dir="./lib" includes="*.jar" excludes="intrace*.jar" />
@@ -195,7 +195,7 @@
       </batchtest>
     </junit>
     
-    <junit printsummary="yes" haltonfailure="yes">
+    <junit printsummary="yes" failureproperty="test.failure">
       <classpath>
         <pathelement location="./build/test"/>                
         <pathelement location="./build/classes_instr"/>
@@ -276,6 +276,7 @@
   </target>
 
   <target name="validate" description="Build jars and run all automated tests" depends="jar, test, findbugs" >
+    <fail message="Tests failed" if="test.failure" />
   </target>
 
   <target name="release1" description="Validate InTrace and copy files ready for Eclipse build" depends="validate,update_eclipse_jars">
diff --git a/org.intrace/lib/intrace-agent.jar b/org.intrace/lib/intrace-agent.jar
index cd3b3e5..ec942a4 100644
Binary files a/org.intrace/lib/intrace-agent.jar and b/org.intrace/lib/intrace-agent.jar differ