diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index e7edc792d6c0d91f447996b830cd583f8e8d428b..530eb6e2107c8871a41d87c2e6f5a63e0b4b45df 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -167,7 +167,7 @@
         description="Run our JUnit's within an instance of antRunner">
         <property
             name="test-vm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
+            value="${env.JAVA_6_HOME}/bin/java"/>
         <property
             name="plugin-path"
             value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
@@ -212,7 +212,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java"
+            jvm="${env.JAVA_6_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
index 8eccce38c95df5a6fe43f3b2c4ae2d5864a9e9d9..86a88f925e588b4d4750a387f2393f6ff972f150 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -74,7 +74,7 @@
             value="${junit-report-output}/raw/${classname}.xml"/>
         <property
             name="jvm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
+            value="${env.JAVA_6_HOME}/bin/java"/>
         <dirname
             file="${ant.file}"
             property="currentDir"/>
@@ -122,7 +122,7 @@
             message="buildLabel: ${buildLabel}"/>
         <echo
             level="debug"
-            message="jvm: ${env.JAVA_5_HOME}/bin/java"/>
+            message="jvm: ${jvm}"/>
     </target>
     <target
         name="core-test"
@@ -188,7 +188,7 @@
             failonerror="false"
             timeout="${timeout}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java"
+            jvm="${jvm}"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset
diff --git a/releng.wtpbuilder/distribution/xml.tests/build.xml b/releng.wtpbuilder/distribution/xml.tests/build.xml
index e7edc792d6c0d91f447996b830cd583f8e8d428b..530eb6e2107c8871a41d87c2e6f5a63e0b4b45df 100644
--- a/releng.wtpbuilder/distribution/xml.tests/build.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/build.xml
@@ -167,7 +167,7 @@
         description="Run our JUnit's within an instance of antRunner">
         <property
             name="test-vm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
+            value="${env.JAVA_6_HOME}/bin/java"/>
         <property
             name="plugin-path"
             value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
@@ -212,7 +212,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java"
+            jvm="${env.JAVA_6_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset
diff --git a/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
index 8eccce38c95df5a6fe43f3b2c4ae2d5864a9e9d9..86a88f925e588b4d4750a387f2393f6ff972f150 100644
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
@@ -74,7 +74,7 @@
             value="${junit-report-output}/raw/${classname}.xml"/>
         <property
             name="jvm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
+            value="${env.JAVA_6_HOME}/bin/java"/>
         <dirname
             file="${ant.file}"
             property="currentDir"/>
@@ -122,7 +122,7 @@
             message="buildLabel: ${buildLabel}"/>
         <echo
             level="debug"
-            message="jvm: ${env.JAVA_5_HOME}/bin/java"/>
+            message="jvm: ${jvm}"/>
     </target>
     <target
         name="core-test"
@@ -188,7 +188,7 @@
             failonerror="false"
             timeout="${timeout}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java"
+            jvm="${jvm}"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset