diff --git a/releng/build-scripts/build/OT-Compiler/build.properties b/releng/build-scripts/build/OT-Compiler/build.properties
index 747aa9c..bf431c9 100644
--- a/releng/build-scripts/build/OT-Compiler/build.properties
+++ b/releng/build-scripts/build/OT-Compiler/build.properties
@@ -14,7 +14,7 @@
 JavaSE-10=/shared/common/java/oracle/jdk-10_x64-latest/lib/jrt-fs.jar
 JavaSE-9=/shared/common/java/oracle/jdk-9_x64-latest/lib/jrt-fs.jar
 
-JavaSE-1.8=/shared/common/jdk1.8.0_x64-latest/jre/lib/charsets.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/deploy.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/javaws.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/jce.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/jfr.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/jfxswt.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/jsse.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/management-agent.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/plugin.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/resources.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/rt.jar
+JavaSE-1.8=/opt/tools/java/oracle/jdk-8/latest/jre/lib/charsets.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/deploy.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/javaws.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/jce.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/jfr.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/jfxswt.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/jsse.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/management-agent.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/plugin.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/resources.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/rt.jar
 
 JavaSE-1.7=/shared/common/oracle-jre1.7.0/lib/rt.jar:/shared/common/oracle-jre1.7.0/lib/charsets.jar:/shared/common/oracle-jre1.7.0/lib/deploy.jar:/shared/common/oracle-jre1.7.0/lib/management-agent.jar:/shared/common/oracle-jre1.7.0/lib/alt-rt.jar:/shared/common/oracle-jre1.7.0/lib/plugin.jar:/shared/common/oracle-jre1.7.0/lib/security/US_export_policy.jar:/shared/common/oracle-jre1.7.0/lib/security/local_policy.jar:/shared/common/oracle-jre1.7.0/lib/resources.jar:/shared/common/oracle-jre1.7.0/lib/jsse.jar:/shared/common/oracle-jre1.7.0/lib/jce.jar:/shared/common/oracle-jre1.7.0/lib/javaws.jar
 
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 98ee275..00c57a3 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -203,7 +203,7 @@
 
 	<target name="UnzipEclipse">
 		<echo message="Extracting Boot Eclipse (${eclipse-app.tgz}) in ${build.root.dir}..."/>
-		<tempfile property="eclipse.app.tmp"/>
+		<tempfile property="eclipse.app.tmp" prefix="eclipse-app"/>
 		<get src="${eclipse-app.tgz}" dest="${eclipse.app.tmp}"/>
 
 		<mkdir dir="${build.root.dir}"/>
@@ -211,9 +211,10 @@
 		<echo message="Extracting Base Eclipse (${eclipse.app.tmp}) in ${test.root.dir}..."/>
 		<mkdir dir="${test.root.dir}"/>
 		<untar compression="gzip" src="${eclipse.app.tmp}" dest="${test.root.dir}"/>
-		<!-- avoid conflict with OTDT-variant when resolving source plug-ins against baseLocation: -->
 		<delete>
+			<!-- avoid conflict with OTDT-variant when resolving source plug-ins against baseLocation: -->
 		    <fileset dir="${baseLocation}/plugins/" includes="org.eclipse.jdt.core_*.v* org.eclipse.jdt.core.source_*.v*" />
+			<filename name="${eclipse.app.tmp}"/>
 		</delete>
 	</target>
 	
@@ -284,7 +285,10 @@
         <!-- Make org.eclipse.test.performance available while compiling test projects: -->
         <echo message="Pre-installing Eclipse Test Framework into base Eclipse..."/>
         <mkdir dir="${testsUpdatesDirBase}/eclipse"/>
-        <unzip dest="${testsUpdatesDirBase}/eclipse" src="${eclipse.tests.zip}"/> 
+		<tempfile property="eclispe.tests.tmp" prefix="eclipse.test"/>
+		<get src="${eclipse.tests.zip}" dest="${eclipse.test.tmp"/>
+        <unzip dest="${testsUpdatesDirBase}/eclipse" src="${eclipse.tests.tmp}"/> 
+		<delete><filename name="${eclipse.test.tmp}"/></delete>
         <ant antfile="${OTScriptDir}/p2helper.xml" target="installFeature" dir="${baseLocation}">
             <property name="feature" value="org.eclipse.test.feature.group"/>
             <property name="sourceUpdatesDir" value="${testsUpdatesDirBase}/eclipse"/>