diff --git a/build.xml b/build.xml
index 99960bd2..dc8c89f1 100644
--- a/build.xml
+++ b/build.xml
@@ -363,6 +363,30 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		<echo>Tests will now run against OpenJDK7</echo>
 		<antcall target="-createEclipseLaunchForTestEnvironmentIfEclipseProject" />
 	</target>
+	
+	<target name="setupJavaOracle7TestEnvironment" description="Sets up the test so that 'ant test' will test against OpenJDK7.">
+		<mkdir dir="lib/oracleJDK7Environment" />		
+		<propertyfile file="testenvironment.properties">
+			<entry key="test.location.javac" value="lib/oracleJDK7Environment/tools-jdk7.jar" />
+			<entry key="test.location.bootclasspath" value="lib/oracleJDK7Environment/rt-oraclejdk7.jar" />
+			<entry key="test.location.name" value="OracleJDK7" />
+		</propertyfile>
+		<echo>Tests will now run against Oracle JDK7</echo>
+		<antcall target="-createEclipseLaunchForTestEnvironmentIfEclipseProject" />
+	</target>
+	
+	<target name="setupJavaOracle8TestEnvironment" description="Sets up the test so that 'ant test' will test against OpenJDK7.">
+		<mkdir dir="lib/oracleJDK8Environment" />
+		<!--get src="http://projectlombok.org/ivyrepo/langtools/javac-1.7.0.jar" dest="lib/openJDK7Environment/javac7.jar" verbose="true" usetimestamp="true" /-->
+		<!--get src="http://projectlombok.org/ivyrepo/langtools/rt-openjdk7.jar" dest="lib/openJDK7Environment/rt-openjdk7.jar" verbose="true" usetimestamp="true" /-->
+		<propertyfile file="testenvironment.properties">
+			<entry key="test.location.javac" value="lib/oracleJDK8Environment/tools-jdk8.jar" />
+			<entry key="test.location.bootclasspath" value="lib/oracleJDK8Environment/rt-oraclejdk8.jar" />
+			<entry key="test.location.name" value="OracleJDK8" />
+		</propertyfile>
+		<echo>Tests will now run against Oracle JDK8</echo>
+		<antcall target="-createEclipseLaunchForTestEnvironmentIfEclipseProject" />
+	</target>
 
 	<target name="-failIfNoTestEnvironmentProperties" unless="test.location.javac">
 		<fail>ERROR: No test environment set up.