diff --git a/build.xml b/build.xml
index 72f2712..ec08833 100644
--- a/build.xml
+++ b/build.xml
@@ -7,23 +7,25 @@
     <target name="prepare">
         <mkdir dir="${basedir}/build/logs" />
         <mkdir dir="${basedir}/build/clover" />
+        <mkdir dir="${basedir}/build/phpdoc" />
     </target>
 
-    <target name="phpunit">
+    <target name="phpdoc">
         <exec dir="${basedir}" executable="php" failonerror="true">
-            <arg value="phpunit.phar"/>
-            <arg line="--configuration phpunit.xml
-                       --log-junit ${basedir}/build/logs/phpunit.xml
-                       --coverage-clover ${basedir}/build/logs/clover.xml
-                       --coverage-html ${basedir}/build/clover" />
+            <arg value="apigen.phar"/>
+            <arg line="generate --source . 
+                                --exclude 'tests/*'
+                                --exclude 'Core/System/Smarty/*'
+                                --title 'FuzeWorks Documentation build #${buildNumber}'
+                                --destination build/phpdoc" />
         </exec>
     </target>
 
     <target name="zip">
         <exec dir="${basedir}" executable="zip" failonerror="true">
-            <arg line="-r ${basedir}/build/fuzeworks-core.zip . -x build\* tests\*" />
+            <arg line="-r ${basedir}/build/fuzeworks-core.zip . -x build\* tests\* .git\*" />
         </exec>
     </target>
 
-    <target name="build" depends="clean,prepare,phpunit,zip" />
+    <target name="build" depends="clean,prepare,phpdoc,zip" />
 </project>
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
index bc5ebc2..c0515ed 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,8 +1,24 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
-    bootstrap="load.php">
+    bootstrap="load.php"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    forceCoversAnnotation="false"
+    mapTestClassNameToCoveredClassName="false"
+    printerClass="PHPUnit_TextUI_ResultPrinter"
+    processIsolation="false"
+    stopOnError="false"
+    stopOnFailure="false"
+    stopOnIncomplete="false"
+    stopOnSkipped="false"
+    testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
+    timeoutForSmallTests="1"
+    timeoutForMediumTests="10"
+    timeoutForLargeTests="60"
+    verbose="true">
 
     <testsuites>
-        <testsuite name="FuzeWorks Core Tests">
+        <testsuite name="Core Functionality">
             <directory>tests</directory>
         </testsuite>
     </testsuites>