diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
index bf4b8f607adcd4c675f961b4d057be814f081478..0f0accbed766eccddea2644b75e9924c612c64b7 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -124,7 +124,7 @@
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
-            failonerror="true">
+            failonerror="false">
             <arg
                 line="-o -qq @zipprefix@-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
         </exec>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
index 7fbd57f386dcd3dbaf5dd27be7e3627fefffabf1..3734f53d80ffe52ab6c3b3f051a86c1b93e3b033 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
@@ -33,12 +33,12 @@
                 name="groupId"
                 value="emfxsd"/>
         </antcall>
-                     <antcall
-                         target="getAndInstallDropins">
-                         <param
-                             name="groupId"
-                             value="emfvalidation"/>
-                     </antcall>
+        <antcall
+            target="getAndInstallDropins">
+            <param
+                name="groupId"
+                value="emfvalidation"/>
+        </antcall>
         <antcall
             target="getAndInstallDropins">
             <param
@@ -57,10 +57,12 @@
                 name="groupId"
                 value="eclipseTestFramework"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstallDropins"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+        <antcall
+            target="getAndInstallDropins">
+            <param
+                name="groupId"
+                value="dtp"/>
+        </antcall>
         <antcall
             target="getAndInstallDropins">
             <param
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/build.xml b/releng.wtpbuilder/distribution/jaxws.tests/build.xml
index 6761c2fa43fda54b99f4f50dbb40423b3a3e622c..ac14b2fe20b01d8cc9afd4ec648c227580d34172 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/build.xml
@@ -124,7 +124,7 @@
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
-            failonerror="true">
+            failonerror="false">
             <arg
                 line="-o -qq wtp-incubator-jaxws-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
         </exec>
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
index 68c537aa11091bcd36efc2b22184b978a8981a54..f1ace238fd2d03414a21d8ba80754c51e201a7f4 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
@@ -33,12 +33,12 @@
                 name="groupId"
                 value="emfxsd"/>
         </antcall>
-                     <antcall
-                         target="getAndInstallDropins">
-                         <param
-                             name="groupId"
-                             value="emfvalidation"/>
-                     </antcall>
+        <antcall
+            target="getAndInstallDropins">
+            <param
+                name="groupId"
+                value="emfvalidation"/>
+        </antcall>
         <antcall
             target="getAndInstallDropins">
             <param
@@ -57,10 +57,12 @@
                 name="groupId"
                 value="eclipseTestFramework"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstallDropins"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+        <antcall
+            target="getAndInstallDropins">
+            <param
+                name="groupId"
+                value="dtp"/>
+        </antcall>
         <antcall
             target="getAndInstallDropins">
             <param