diff --git a/build.xml b/build.xml
index 5fead285..006a546b 100644
--- a/build.xml
+++ b/build.xml
@@ -75,6 +75,10 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		</ant>
 	</target>
 	
+	<target name="test" depends="compile">
+		<ant antfile="buildScripts/test.ant.xml" target="test" />
+	</target>
+	
 	<target name="findbugs" description="Runs findbugs on the code">
 		<ant antfile="buildScripts/compile.ant.xml" target="findbugs" inheritAll="false" />
 	</target>
diff --git a/buildScripts/test.ant.xml b/buildScripts/test.ant.xml
new file mode 100644
index 00000000..742819c5
--- /dev/null
+++ b/buildScripts/test.ant.xml
@@ -0,0 +1,79 @@
+<!--
+  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+-->
+<project name="lombok-test" basedir=".." default="test">
+	<description>
+This buildfile is part of projectlombok.org. It responsible for running unit tests.
+	</description>
+	
+	<path id="deps.path">
+		<fileset dir="deps/lombok">
+			<include name="**/*.jar" />
+			<exclude name="**/ant.jar" />
+		</fileset>
+		<fileset dir="deps">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+	
+	<path id="libs.path">
+		<fileset dir="lib/lombok">
+			<include name="**/*.jar" />
+		</fileset>
+		<fileset dir="lib">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+	
+	<target name="-test-compile" unless="skipTests">
+		<mkdir dir="build/tests" />
+		<javac debug="on" destdir="build/tests" target="1.5">
+			<classpath refid="deps.path" />
+			<classpath refid="libs.path" />
+			<classpath path="build/lombok" />
+			<src path="test/core/src" />
+			<src path="test/delombok/src" />
+		</javac>
+		<copy todir="build/tests">
+			<fileset dir="test/lombok/resource" />
+			<fileset dir="test/delombok/resource" />
+		</copy>
+	</target>
+	
+	<target name="test" depends="-test-compile" unless="tests.skip">
+		<junit haltonfailure="yes" fork="on">
+			<formatter type="plain" usefile="false" unless="tests.quiet" />
+			<classpath refid="deps.path" />
+			<classpath refid="libs.path" />
+			<classpath path="build/lombok" />
+			<classpath path="build/tests" />
+			<batchtest>
+				<fileset dir="test/core/src">
+					<include name="**/Test*.java" />
+				</fileset>
+				<fileset dir="test/delombok/src">
+					<include name="**/Test*.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+		<echo level="info">All tests successful.</echo>
+	</target>
+</project>
diff --git a/test/core/src/lombok/DirectoryRunner.java b/test/core/src/lombok/DirectoryRunner.java
index 40b21aa0..1c8cfb2e 100644
--- a/test/core/src/lombok/DirectoryRunner.java
+++ b/test/core/src/lombok/DirectoryRunner.java
@@ -82,7 +82,7 @@ public class DirectoryRunner extends Runner {
 		if (mustIgnore(file)) {
 			return false;
 		}
-		TestViaDelombok.compareFile(afterDirectory, file);
+		RunTestsViaDelombok.compareFile(afterDirectory, file);
 		return true;
 	}
 
diff --git a/test/core/src/lombok/TestViaDelombok.java b/test/core/src/lombok/RunTestsViaDelombok.java
similarity index 99%
rename from test/core/src/lombok/TestViaDelombok.java
rename to test/core/src/lombok/RunTestsViaDelombok.java
index 63a8e1f8..f2aedfa3 100644
--- a/test/core/src/lombok/TestViaDelombok.java
+++ b/test/core/src/lombok/RunTestsViaDelombok.java
@@ -33,7 +33,7 @@ import java.util.List;
 
 import lombok.delombok.Delombok;
 
-public class TestViaDelombok {
+public class RunTestsViaDelombok {
 	private static Delombok delombok = new Delombok();
 	private static volatile boolean printErrors = false;
 	
diff --git a/test/delombok/src/lombok/delombok/TestLombokFiles.java b/test/delombok/src/lombok/delombok/TestLombokFiles.java
index 66e3580e..12c16d76 100644
--- a/test/delombok/src/lombok/delombok/TestLombokFiles.java
+++ b/test/delombok/src/lombok/delombok/TestLombokFiles.java
@@ -24,7 +24,7 @@ package lombok.delombok;
 import java.io.File;
 
 import lombok.DirectoryRunner;
-import lombok.TestViaDelombok;
+import lombok.RunTestsViaDelombok;
 
 import org.junit.runner.RunWith;
 
@@ -32,7 +32,7 @@ import org.junit.runner.RunWith;
 public class TestLombokFiles {
 	
 	public static File getBeforeDirectory() {
-		TestViaDelombok.printErrors(true);
+		RunTestsViaDelombok.printErrors(true);
 		return new File("test/lombok/resource/before");
 	}