diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index ac7d36c..63a604f 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -400,10 +400,10 @@
             <ant>
                 <property
                     name="dependencyFileLocation"
-                    value="helios/dependencies.properties"/>
+                    value="indigo/dependencies.properties"/>
                 <property
                     name="testdependencyFileLocation"
-                    value="helios/jsdttestdependency.xml"/>
+                    value="indigo/jsdttestdependency.xml"/>
                 <property
                     name="buildType"
                     value="I"/>
@@ -415,7 +415,7 @@
                     value="1.3.0"/>
                 <property
                     name="mapVersionTag"
-                    value="HEAD"/>                    
+                    value="HEAD"/>
                 <property
                     name="releng.jsdt-mapVersionTag"
                     value="HEAD"/>
@@ -1022,7 +1022,7 @@
                 <property
                     name="build.distribution"
                     value="wtp"/>
-                
+
             </ant>
         </schedule>
     </project>
@@ -1106,7 +1106,7 @@
                     value="false"/>
             </ant>
         </schedule>
-    </project>    
+    </project>
     <project
         forceOnly="true"
         requireModification="true"
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml
index 41c9cbd..8d2cd21 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml
@@ -92,6 +92,26 @@
                 <exclude
                     name="**/*performance*/test.xml"/>
                 <include
+                 name="**/*releng*/test.xml"/>
+           </fileset>
+       </subant>
+       <!-- copy early, if we can  -->
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
+      	<subant
+            target=""
+            inheritall="true">
+            <!-- note that we specify "high" directory to get tests installed 
+                in any location -->
+            <fileset
+                dir="${testRoot}">
+                <!-- but we must be sure to exclude _this_ test.xml file 
+                    we are running -->
+                <exclude
+                    name="test.xml"/>
+                <exclude
+                    name="**/*performance*/test.xml"/>
+                <include
                     name="**/test.xml"/>
             </fileset>
         </subant>
@@ -128,7 +148,7 @@
             target=""
             inheritall="true">
             <fileset
-                dir="${eclipse-home}/plugins/">
+                dir="${eclipse-home}/">
                 <exclude
                     name="**/*performance*/test.xml"/>
                 <include