diff --git a/build.xml b/build.xml
index ce7736ab..8fbce893 100644
--- a/build.xml
+++ b/build.xml
@@ -680,7 +680,9 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 </fail>
 	</target>
 	
-	<target name="test" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj, -test-check, -test8, -test9" />
+	<target name="test" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj, -test-check, -test8, -test9" description="Runs all tests." />
+	
+	<target name="testfast" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, -test-check, -test8, -test9" />
 	
 	<target name="-test-check">
 		<condition property="test9.run">
@@ -697,7 +699,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 		</condition>
 	</target>
 	
-	<target name="-test9" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj" if="test9.run">
+	<target name="-test9" if="test9.run">
 		<echo>Running test suite in JDK9+ mode</echo>
 		<junit haltonfailure="no" fork="true">
 			<jvmarg value="-javaagent:dist/lombok.jar" />
@@ -732,7 +734,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 			</junit>
 	</target>
 	
-	<target name="-test8" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj" if="test8.run" description="Runs the tests.">
+	<target name="-test8" if="test8.run">
 		<echo>Running test suite in JDK6-8 mode</echo>
 		<junit haltonfailure="no" fork="true">
 			<jvmarg value="-javaagent:dist/lombok.jar" />
diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java
index f93fbe27..fc05aea2 100644
--- a/test/core/src/lombok/AbstractRunTests.java
+++ b/test/core/src/lombok/AbstractRunTests.java
@@ -197,7 +197,7 @@ public abstract class AbstractRunTests {
 		}
 	}
 	
-	@SuppressWarnings("null") /* eclipse bug; it falsely thinks stuffAc will always be null or some such hogwash. */
+	@SuppressWarnings("null") /* eclipse bug workaround; it falsely thinks stuffAc will always be null. */
 	private static void compareMessages(String name, LombokImmutableList<CompilerMessageMatcher> expected, LinkedHashSet<CompilerMessage> actual) {
 		Iterator<CompilerMessageMatcher> expectedIterator = expected.iterator();
 		Iterator<CompilerMessage> actualIterator = actual.iterator();