diff --git a/.gitignore b/.gitignore
index 4c09de1..12c5c19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /user.property
 /content/WEB-INF/classes
 /plantuml.war
+/dist
 
diff --git a/build.xml b/build.xml
index 0043a49..3e8773f 100644
--- a/build.xml
+++ b/build.xml
@@ -3,21 +3,36 @@
 	<target name="main" depends="clean,compile,war">
 	</target>
 
+    <taskdef name="junit"
+        classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
+        <classpath>
+            <pathelement location="test/lib/junit-3.8.1.jar" />
+        </classpath>
+    </taskdef>
+
+    
     <target name="init">
     	<!-- overwrite with your own values in a user.property file -->
     	<property file="user.property" />
-        <property name="target" value="." description="Target directory of the build"/>
+        <property name="target" value="dist" description="Target directory of the build"/>
         <property name="tomcat-home" value="/tomcat" description="Home directory of Tomcat"/>
         <property name="debug" value="false" />
+        <mkdir dir="${target}" />
         <path id="project-classpath">
             <fileset dir="content/WEB-INF/lib" includes="*.jar" />
             <fileset dir="${tomcat-home}/lib" includes="*.jar" />
         </path>
+        <path id="test-classpath">
+            <fileset dir="test/lib" includes="*.jar" />
+            <pathelement location="${target}"/>
+        </path>
     </target>
 
 	<target name="clean" depends="init">
 		<delete file="${target}/plantuml.war" />
-	    <mkdir dir="${target}" />
+	    <delete>
+	        <fileset dir="${target}" includes="**/*.class"/>
+	      </delete>
 		<delete dir="content/WEB-INF/classes" />
 		<mkdir dir="content/WEB-INF/classes" />
 	</target>
@@ -38,4 +53,18 @@
         <copy file="${target}/plantuml.war" todir="${tomcat-home}/webapps" overwrite="true" />
     </target>
 
+    <target name="test" depends="init">
+        <echo>
+            WARN - Test execution requires an running PlantUMLServer.
+        </echo>
+        <javac srcdir="test/src" destdir="${target}" debug="${debug}" classpathref="test-classpath" />
+        <junit showoutput="true" >
+            <classpath>
+                <path refid="test-classpath"/>
+            </classpath>
+            <formatter type="plain" usefile="false" />
+            <test name="net.sourceforge.plantuml.servlet.AllTests"/>
+        </junit>
+    </target>
+
 </project>