diff --git a/build.xml b/build.xml
index e157632b..b562fcb4 100644
--- a/build.xml
+++ b/build.xml
@@ -487,6 +487,7 @@ ${sourceWarning}</echo>
 				<filter token="ECJ_LOCATION" value="${test.location.ecj}" />
 				<filter token="RT_LOCATION" value="${test.location.bootclasspath}" />
 				<filter token="JAVA_VERSION" value="${test.javaversion}" />
+				<filter token="PATH_SEP" value="${path.separator}" />
 			</filterset>
 		</copy>
 		<echo>WARNING: If you wish to test JDK8 features in eclipse, there must be a JDK8 installation configured in your eclipse, and it must be called 'JavaSE-1.8'.</echo>
diff --git a/buildScripts/eclipse-run-tests.template b/buildScripts/eclipse-run-tests.template
index 06bc22b7..530341ab 100644
--- a/buildScripts/eclipse-run-tests.template
+++ b/buildScripts/eclipse-run-tests.template
@@ -26,5 +26,5 @@
 	<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.@JAVA_VERSION@"/>
 	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="lombok.RunAllTests"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="lombok"/>
-	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:dist/lombok.jar -Ddelombok.bootclasspath=@RT_LOCATION@ -Dshadow.override.lombok=true"/>
+	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:dist/lombok.jar -Dshadow.override.lombok=${project_loc:lombok}/bin@PATH_SEP@${project_loc:lombok}/lib/runtime/* -Ddelombok.bootclasspath=@RT_LOCATION@"/>
 </launchConfiguration>