diff --git a/.gitignore b/.gitignore
index e154788b..1a5e850a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /bin
 /docs
 /build/*
+!/build/phpunit.xml
 !/build/phpmd.xml
 !/build/phpdox.xml
 /vendor/
@@ -10,3 +11,4 @@
 /apikey.php
 /phpunit
 /public_html
+/cache.properties
diff --git a/build.xml b/build.xml
index b85793a3..3942b6ff 100644
--- a/build.xml
+++ b/build.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="php-tmdb-api" default="build">
+<project name="php-tmdb-api" default="build-parallel">
     <target name="build"
             depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpunit,phpdox"/>
 
     <target name="build-parallel"
-            depends="prepare,lint,tools-parallel,phpunit"/>
+            depends="prepare,lint,tools-parallel,phpunit,phpdox"/>
 
     <target name="tools-parallel" description="Run tools in parallel">
         <parallel threadCount="2">
@@ -13,12 +13,9 @@
                 <antcall target="pdepend"/>
                 <antcall target="phpmd-ci"/>
             </sequential>
+            <antcall target="phploc"/>
             <antcall target="phpcpd"/>
             <antcall target="phpcs-ci"/>
-            <antcall target="phploc"/>
-            <!--
-            <antcall target="phpdox"/>
-            -->
         </parallel>
     </target>
 
@@ -122,6 +119,9 @@
     </target>
 
     <target name="phpunit" description="Run unit tests with PHPUnit">
-        <exec executable="phpunit" failonerror="true"/>
+        <exec executable="phpunit" failonerror="true">
+            <arg value="-c" />
+            <arg path="${basedir}/build/phpunit.xml" />
+        </exec>
     </target>
 </project>
diff --git a/build/phpunit.xml b/build/phpunit.xml
new file mode 100644
index 00000000..60217598
--- /dev/null
+++ b/build/phpunit.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="../test/bootstrap.php"
+        >
+    <testsuites>
+        <testsuite name="php-tmdb-api Test Suite">
+            <directory>../test/Tmdb/</directory>
+        </testsuite>
+    </testsuites>
+
+    <groups>
+        <exclude>
+            <group>functional</group>
+        </exclude>
+    </groups>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">../lib/Tmdb/</directory>
+        </whitelist>
+    </filter>
+
+    <logging>
+        <log type="coverage-html" target="coverage" charset="UTF-8"
+             yui="true" highlight="true"
+             lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-clover" target="coverage/xml/index.xml" charset="UTF-8"
+             yui="true" highlight="true"
+             lowUpperBound="35" highLowerBound="70"/>
+    </logging>
+</phpunit>
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 19f79649..819f8286 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -28,13 +28,4 @@
             <directory suffix=".php">./lib/Tmdb/</directory>
         </whitelist>
     </filter>
-
-    <logging>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8"
-             yui="true" highlight="true"
-             lowUpperBound="35" highLowerBound="70"/>
-        <log type="coverage-clover" target="build/coverage/xml/index.xml" charset="UTF-8"
-             yui="true" highlight="true"
-             lowUpperBound="35" highLowerBound="70"/>
-    </logging>
 </phpunit>
\ No newline at end of file