diff --git a/build/build.xml b/build/build.xml
index 8e64fb1..5020345 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -40,7 +40,7 @@
       <touch file="${reports.dir}/errors-${platform}.log"/>
     </quiet>
     <for param="file">
-      <fileset dir="${tests.dir}/errors_test" includes="*.cpp"/>
+      <fileset dir="${tests.dir}/test" includes="fail*.cpp"/>
       <sequential>
         <record name="${reports.dir}/errors-${platform}.log" action="start" append="true"/>
         <ant target="-analyse">
@@ -150,6 +150,12 @@
     <replaceregexp match="(}${line.separator}${line.separator}#endif //)" replace="}${line.separator}\1" flags="g">
         <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
     </replaceregexp>
+    <replaceregexp match="(}${line.separator}${line.separator}#define)" replace="}${line.separator}\1" flags="g">
+        <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
+    </replaceregexp>
+    <replaceregexp match="(mock::)" replace="boost::\1" flags="g">
+        <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
+    </replaceregexp>
   </target>
 
   <target name="all" depends="configure,test,bench,reports,export,package" description="configure, build and run tests and benchmark, export and package distribution"/>