diff --git a/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml b/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml
index 0984dc88d22769121f75cf8fa6b81901b0c4f369..54ad88b852c1b77d337ad44b4ac3b02def89b3cd 100644
--- a/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml
+++ b/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml
@@ -75,8 +75,11 @@
 
     <target
         name="build"
+    	 depends="doMirror">
+    	
+    	<!--
         depends="doMirror,doMirrorTests">
-
+       -->
 	<!-- add the new build to the composite -->
     	<!-- 
     	TODO: after promotion, do we need to delete repo's as directories removed? Or just do occasional cleanup, 
@@ -285,6 +288,11 @@
                 comparator="org.eclipse.equinox.p2.repository.tools.jar.comparator"
                 comparatorLog="${buildDirectory}/${buildLabel}/comparator-unittest.log">
                 <repository location="file:/${baseComparatorRepoDir}"/>
+                <!-- Note: comparator has fixed this issues in 3.7 stream, but 
+                     since we use this same code in maintenance stream, with 3.6 based builder, 
+                     then we need to leave these excluded in place (or, make them stream sensitive, 
+                     which doesn't seem worth it
+                 -->
                 <exclude>
                     <artifact id="org.eclipse.jpt.eclipselink.ui"/>
                     <artifact id="org.eclipse.jpt.ui"/>
diff --git a/releng.wtpbuilder/distribution/patches32x.package/createmainzips.xml b/releng.wtpbuilder/distribution/patches32x.package/createmainzips.xml
index 2562d685c3e9f1099090f28f87273fae1a62b717..0cf2f55949acaf8c816a1ad6c751db1ba153448e 100644
--- a/releng.wtpbuilder/distribution/patches32x.package/createmainzips.xml
+++ b/releng.wtpbuilder/distribution/patches32x.package/createmainzips.xml
@@ -113,11 +113,13 @@
                 value="${build.distribution}-sdk-${buildLabel}.zip"/>
         </antcall>
         -->
+<!--
         <antcall target="createTestZip">
             <param
                 name="newarchiveName"
                 value="${build.distribution}-tests-${buildLabel}.zip"/>
         </antcall>
+ -->       
     </target>
 	<!--
 	Note: this was done as an import, since eventually there may be more than one ... differ by streams? There may be