diff --git a/tests/build.xml b/tests/build.xml
index 74c2a86886..14a0f364fc 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -21,51 +21,47 @@
  </target>
 
  <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/build/api"/>
-  <delete dir="${basedir}/build/code-browser"/>
-  <delete dir="${basedir}/build/coverage"/>
-  <delete dir="${basedir}/build/logs"/>
-  <delete dir="${basedir}/build/pdepend"/>
+  <delete dir="${basedir}/tests/api"/>
+  <delete dir="${basedir}/tests/code-browser"/>
+  <delete dir="${basedir}/tests/coverage"/>
+  <delete dir="${basedir}/tests/logs"/>
+  <delete dir="${basedir}/tests/pdepend"/>
  </target>
 
  <target name="prepare" depends="clean" description="Prepare for build">
-  <mkdir dir="${basedir}/build/api"/>
-  <mkdir dir="${basedir}/build/code-browser"/>
-  <mkdir dir="${basedir}/build/coverage"/>
-  <mkdir dir="${basedir}/build/logs"/>
-  <mkdir dir="${basedir}/build/pdepend"/>
-  <mkdir dir="${basedir}/build/phpdox"/>
+  <mkdir dir="${basedir}/tests/api"/>
+  <mkdir dir="${basedir}/tests/code-browser"/>
+  <mkdir dir="${basedir}/tests/coverage"/>
+  <mkdir dir="${basedir}/tests/logs"/>
+  <mkdir dir="${basedir}/tests/pdepend"/>
+  <mkdir dir="${basedir}/tests/phpdox"/>
  </target>
 
  <target name="lint" description="Perform syntax check of sourcecode files">
   <apply executable="php" failonerror="true">
    <arg value="-l" />
 
-   <fileset dir="${basedir}/src">
+   <fileset dir="${basedir}">
     <include name="**/*.php" />
     <modified />
    </fileset>
 
-   <fileset dir="${basedir}/tests">
-    <include name="**/*.php" />
-    <modified />
-   </fileset>
   </apply>
  </target>
 
  <target name="phploc" description="Measure project size using PHPLOC">
   <exec executable="phploc">
    <arg value="--log-csv" />
-   <arg value="${basedir}/build/logs/phploc.csv" />
-   <arg path="${basedir}/src" />
+   <arg value="${basedir}/tests/logs/phploc.csv" />
+   <arg path="${basedir}" />
   </exec>
  </target>
 
  <target name="pdepend" description="Calculate software metrics using PHP_Depend">
   <exec executable="pdepend">
-   <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
-   <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
-   <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
+   <arg value="--jdepend-xml=${basedir}/tests/logs/jdepend.xml" />
+   <arg value="--jdepend-chart=${basedir}/tests/pdepend/dependencies.svg" />
+   <arg value="--overview-pyramid=${basedir}/tests/pdepend/overview-pyramid.svg" />
    <arg path="${basedir}/src" />
   </exec>
  </target>
@@ -73,44 +69,44 @@
  <target name="phpmd"
          description="Perform project mess detection using PHPMD and print human readable output. Intended for usage on the command line before committing.">
   <exec executable="phpmd">
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}" />
    <arg value="text" />
-   <arg value="${basedir}/build/phpmd.xml" />
+   <arg value="${basedir}/tests/phpmd.xml" />
   </exec>
  </target>
 
  <target name="phpmd-ci" description="Perform project mess detection using PHPMD creating a log file for the continuous integration server">
   <exec executable="phpmd">
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}" />
    <arg value="xml" />
-   <arg value="${basedir}/build/phpmd.xml" />
+   <arg value="${basedir}/tests/phpmd.xml" />
    <arg value="--reportfile" />
-   <arg value="${basedir}/build/logs/pmd.xml" />
+   <arg value="${basedir}/tests/logs/pmd.xml" />
   </exec>
  </target>
 
  <target name="phpcs"
          description="Find coding standard violations using PHP_CodeSniffer and print human readable output. Intended for usage on the command line before committing.">
   <exec executable="phpcs">
-   <arg value="--standard=${basedir}/build/phpcs.xml" />
-   <arg path="${basedir}/src" />
+   <arg value="--standard=${basedir}/tests/phpcs.xml" />
+   <arg path="${basedir}" />
   </exec>
  </target>
 
  <target name="phpcs-ci" description="Find coding standard violations using PHP_CodeSniffer creating a log file for the continuous integration server">
   <exec executable="phpcs" output="/dev/null">
    <arg value="--report=checkstyle" />
-   <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
-   <arg value="--standard=${basedir}/build/phpcs.xml" />
-   <arg path="${basedir}/src" />
+   <arg value="--report-file=${basedir}/tests/logs/checkstyle.xml" />
+   <arg value="--standard=${basedir}/tests/phpcs.xml" />
+   <arg path="${basedir}" />
   </exec>
  </target>
 
  <target name="phpcpd" description="Find duplicate code using PHPCPD">
   <exec executable="phpcpd">
    <arg value="--log-pmd" />
-   <arg value="${basedir}/build/logs/pmd-cpd.xml" />
-   <arg path="${basedir}/src" />
+   <arg value="${basedir}/tests/logs/pmd-cpd.xml" />
+   <arg path="${basedir}" />
   </exec>
  </target>
 
@@ -121,11 +117,11 @@
  <target name="phpcb" description="Aggregate tool output with PHP_CodeBrowser">
   <exec executable="phpcb">
    <arg value="--log" />
-   <arg path="${basedir}/build/logs" />
+   <arg path="${basedir}/tests/logs" />
    <arg value="--source" />
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}" />
    <arg value="--output" />
-   <arg path="${basedir}/build/code-browser" />
+   <arg path="${basedir}/tests/code-browser" />
   </exec>
  </target>
 </project>