diff --git a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
index 7fe9b13..4e5843a 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
@@ -87,7 +87,7 @@
                 value="${testRoot}"/>
             <property
                 name="tobeinstalled.properties"
-                value="${wtp.builder.home}/distribution/${build.distribution}.tests/tobeInstalled.properties"/>
+                value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/distribution/${build.distribution}.tests/tobeInstalled.properties"/>
             <property
                 name="installWorkingDirectory"
                 value="${testRoot}"/>
diff --git a/releng.wtpbuilder/scripts/standaloneTest/runEclipsePerfTests.bat b/releng.wtpbuilder/scripts/standaloneTest/runEclipsePerfTests.bat
index 5d95891..9e45ba8 100644
--- a/releng.wtpbuilder/scripts/standaloneTest/runEclipsePerfTests.bat
+++ b/releng.wtpbuilder/scripts/standaloneTest/runEclipsePerfTests.bat
@@ -23,7 +23,7 @@
 REM Install Eclipse if it does not exist
 REM
 REM ****************************************************************
-if NOT EXIST eclipseAnt unzip -qq -o %LOCAL_PREREQS_CACHE%/eclipse-SDK-*%WTP_ECLIPSE_BUILD_ID%*.zip -d eclipseAnt && unzip -qq -o -C eclipse-junit-tests*%WTP_ECLIPSE_BUILD_ID%*.zip plugins/org.eclipse.test* -d eclipseAnt/eclipse/dropins/
+if NOT EXIST eclipseAnt unzip -qq -o %LOCAL_PREREQS_CACHE%/eclipse-SDK-*%ECLIPSE_ID%*.zip -d eclipseAnt && unzip -qq -o -C eclipse-junit-tests*.zip plugins/org.eclipse.test* -d eclipseAnt/eclipse/dropins/
 
 
 :processcmdlineargs
diff --git a/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml b/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml
index 4352a15..29ff2b7 100644
--- a/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml
+++ b/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml
@@ -53,7 +53,6 @@
     <fail
         message="dependency file not found: ${dependency.properties}"
         unless="dependency.properties.exists"/>
-    <property file="${dependency.properties}"/>
     <target name="standalonePerfTest">
         <property
             file="${build.home}/${env.RELENG_BUILDER}/build.properties"/>
@@ -66,6 +65,10 @@
         <property
             name="wtp.dir.id"
             value="${build.stream}/${wtp.id}"/>
+    	<property file="${dependency.properties}"/>
+    	<condition property="eclipse.id" value="${wtp.eclipse.build.id}">
+    	    <isset property="wtp.eclipse.build.id"/>
+    	</condition>
         <property
             name="getprereq.wtp"
             value="true"/>
@@ -127,7 +130,7 @@
    			<exec dir="${testRoot}" executable="cmd">
         	 <env key="JAVA_6_HOME" value="${env.JAVA_6_HOME}"/>
         	 <env key="JAVA_HOME" value="${env.JAVA_HOME}"/>
-           	 <env key="WTP_ECLIPSE_BUILD_ID" value="${wtp.eclipse.build.id}"/>
+           	 <env key="ECLIPSE_ID" value="${eclipse.id}"/>
   				 <arg line="/c runEclipsePerfTests.bat -os ${env.BASEOS} -ws ${env.BASEWS} -arch ${env.BASEARCH} ${testBundle}"/>
 				</exec>
    </target>
@@ -135,7 +138,7 @@
    <target
         name="getEclipseTestDependencies">
         <property name="eAT.url" value="${eclipse.url}"/>
-        <property name="eAT" value="eclipse-Automated-Tests-${wtp.eclipse.build.id}.zip"/>
+        <property name="eAT" value="eclipse-Automated-Tests-${eclipse.id}.zip"/>
         
         <available
 	        file="${local.cache.dir}/${eAT}"