diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
index 7dbf16352420d63305380de6322cb73f9f1e7ce8..6351e266afd78580718248b3c3c227258bc2bf9b 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
@@ -111,6 +111,12 @@
             <property
                 name="tobeinstalled.properties"
                 value="${wtp.builder.home}/distribution/${build.distribution}.tests/tobeInstalled.properties"/>
+            <property
+                  name="installWorkingDirectory"
+                  value="${testRoot}"/>
+        	
+        	
+        	
         </ant>
         <antcall
             target="unzipTests"/>
diff --git a/releng.wtpbuilder/scripts/dependency/build.xml b/releng.wtpbuilder/scripts/dependency/build.xml
index cc6f9dc8b5b5d8d8171f3be65b0cc34407003afc..1e3828039952f6b21c664155ded90edf7053cbcb 100644
--- a/releng.wtpbuilder/scripts/dependency/build.xml
+++ b/releng.wtpbuilder/scripts/dependency/build.xml
@@ -37,6 +37,8 @@
     </description>
 
 
+	<property name="installWorkingDirectory" value="${buildDirectory}"/>
+	
 	<!-- ================================= 
         target: default              
         ================================= -->
@@ -260,7 +262,7 @@
             property="dependency.dir"/>
 
         <copy
-            tofile="${buildDirectory}/dependency.${groupId}.xml"
+            tofile="${installWorkingDirectory}/dependency.${groupId}.xml"
             overwrite="true">
             <fileset
                 dir="${dependency.dir}">
@@ -269,30 +271,30 @@
             </fileset>
         </copy>
         <echo
-            message="Creating dependency script: ${buildDirectory}/dependency.${groupId}.xml "/>
+            message="Creating dependency script: ${installWorkingDirectory}/dependency.${groupId}.xml "/>
         <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
+            file="${installWorkingDirectory}/dependency.${groupId}.xml"
             value="${groupId}.">
             <replacetoken>@dependencyGroupId@</replacetoken>
         </replace>
         <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
+            file="${installWorkingDirectory}/dependency.${groupId}.xml"
             value="${dependency.dir}">
             <replacetoken>@dependencyDir@</replacetoken>
         </replace>
         <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
+            file="${installWorkingDirectory}/dependency.${groupId}.xml"
             value="${dependency.properties}">
             <replacetoken>@dependencyProperties@</replacetoken>
         </replace>
         <ant
-            antfile="${buildDirectory}/dependency.${groupId}.xml"
+            antfile="${installWorkingDirectory}/dependency.${groupId}.xml"
             target="get"/>
 
 		<!--
             <delete failonerror="false">
             <fileset dir=".">
-            <include name="${buildDirectory}/dependency.${groupId}.xml" />
+            <include name="${installWorkingDirectory}/dependency.${groupId}.xml" />
             </fileset>
             </delete>
         -->
@@ -307,7 +309,7 @@
             property="dependency.dir"/>
 
         <copy
-            tofile="${buildDirectory}/dependency.${groupId}.xml">
+            tofile="${installWorkingDirectory}/dependency.${groupId}.xml">
             <fileset
                 dir="${dependency.dir}">
                 <include
@@ -315,22 +317,22 @@
             </fileset>
         </copy>
         <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
+            file="${installWorkingDirectory}/dependency.${groupId}.xml"
             value="${groupId}.">
             <replacetoken>@dependencyGroupId@</replacetoken>
         </replace>
         <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
+            file="${installWorkingDirectory}/dependency.${groupId}.xml"
             value="${dependency.dir}">
             <replacetoken>@dependencyDir@</replacetoken>
         </replace>
         <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
+            file="${installWorkingDirectory}/dependency.${groupId}.xml"
             value="${dependency.properties}">
             <replacetoken>@dependencyProperties@</replacetoken>
         </replace>
         <ant
-            antfile="${buildDirectory}/dependency.${groupId}.xml"
+            antfile="${installWorkingDirectory}/dependency.${groupId}.xml"
             target="install">
             <property
                 name="install.destination"
@@ -340,7 +342,7 @@
 		<!--
             <delete failonerror="false">
             <fileset dir=".">
-            <include name="${buildDirectory}/dependency.${groupId}.xml" />
+            <include name="${installWorkingDirectory}/dependency.${groupId}.xml" />
             </fileset>
             </delete>
         -->
@@ -353,7 +355,7 @@
             property="dependency.dir"/>
 
         <copy
-            tofile="${buildDirectory}/dependency.${groupId}.xml">
+            tofile="${installWorkingDirectory}/dependency.${groupId}.xml">
             <fileset
                 dir="${dependency.dir}">
                 <include
@@ -361,23 +363,23 @@
             </fileset>
         </copy>
         <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
+            file="${installWorkingDirectory}/dependency.${groupId}.xml"
             value="${groupId}.">
             <replacetoken>@dependencyGroupId@</replacetoken>
         </replace>
         <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
+            file="${installWorkingDirectory}/dependency.${groupId}.xml"
             value="${dependency.dir}">
             <replacetoken>@dependencyDir@</replacetoken>
         </replace>
         <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
+            file="${installWorkingDirectory}/dependency.${groupId}.xml"
             value="${dependency.properties}">
             <replacetoken>@dependencyProperties@</replacetoken>
         </replace>
 
         <ant
-            antfile="${buildDirectory}/dependency.${groupId}.xml"
+            antfile="${installWorkingDirectory}/dependency.${groupId}.xml"
             target="installRepo">
             <property
                 name="install.destination"
@@ -387,7 +389,7 @@
               <!--
             <delete failonerror="false">
             <fileset dir=".">
-            <include name="${buildDirectory}/dependency.${groupId}.xml" />
+            <include name="${installWorkingDirectory}/dependency.${groupId}.xml" />
             </fileset>
             </delete>
         -->
diff --git a/releng.wtpbuilder/scripts/dependency/dependency.xml b/releng.wtpbuilder/scripts/dependency/dependency.xml
index 7c4959cf90d9b7bfb1e6512c28c58cea17081fe0..ea513861725008c1f3e1de0928275fb39631d47d 100644
--- a/releng.wtpbuilder/scripts/dependency/dependency.xml
+++ b/releng.wtpbuilder/scripts/dependency/dependency.xml
@@ -16,14 +16,19 @@
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
     <echo
-        level="debug"
+        level="info"
         message="keyCfgFile: ${keyCfgFile}"/>
+    <fail
+        message="Required property file does not exist: ${keyCfgFile}">
+        <condition>
+            <not>
+                <available
+                    file="${keyCfgFile}"/>
+            </not>
+        </condition>
+    </fail>
     <property
-        file="${keyCfgFile}"/>
-        	
-    <property
-        file="build.properties"/>        	
-        	
+        file="${keyCfgFile}"/>        	
     <target
         name="get">
 
@@ -35,8 +40,7 @@
             file="${dependency.properties}"/>
        <property
            file="${tobeinstalled.properties}"/>
-        <mkdir
-            dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
+
         <property
             name="pde.builder.path"
             value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
diff --git a/releng.wtpbuilder/scripts/dependency/template.xml b/releng.wtpbuilder/scripts/dependency/template.xml
index 3887e1f46ea322a6f4a0ee91bc146f66f9920999..943bd2cc7d13963e68182bb260d24aeed1188278 100644
--- a/releng.wtpbuilder/scripts/dependency/template.xml
+++ b/releng.wtpbuilder/scripts/dependency/template.xml
@@ -290,7 +290,7 @@
             <arg
                 value="-data"/>
             <arg
-                value="${buildDirectory}/p2DirectorInstall"/>
+                value="${installWorkingDirectory}/p2DirectorInstall"/>
             <arg
                 value="-application"/>
             <arg