diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index f9bfbe347cb..dfe53bc4c2b 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -88,7 +88,7 @@
 		</ant>
 		<antcall target="tunzip"/>
 		<antcall target="tuntar"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt.testing-${buildId}.zip" dest="${buildDirectory}"/>
+		<unzip src="${zipsdir}/org.eclipse.cdt.testing-${branchVersion}-${buildId}.zip" dest="${buildDirectory}"/>
 		<copy todir="${buildDirectory}/eclipse/plugins/org.eclipse.test">
 			<fileset dir="../org.eclipse.test"/>
 		</copy>
diff --git a/releng/org.eclipse.cdt.releng/buildindex.html b/releng/org.eclipse.cdt.releng/buildindex.html
index e9ddc4d6b03..7f643d60ba1 100644
--- a/releng/org.eclipse.cdt.releng/buildindex.html
+++ b/releng/org.eclipse.cdt.releng/buildindex.html
@@ -142,7 +142,18 @@ integrations for build/debug, user documentation<br>
     </tr>
   </tbody>
 </table>
-<br>
-<br>
+<h3>CDT Testing Feature</h3>
+<p>includes all test plugins required for running automated JUnit tests</p>
+<table cellpadding="2" cellspacing="2" border="1"
+ style="text-align: left; width: 100%;">
+  <tbody>
+    <tr>
+      <td style="vertical-align: top;">All</td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt.testing-@branchVersion@-@buildId@.zip">org.eclipse.cdt.testing-@branchVersion@-@buildId@.zip</a><br>
+      </td>
+    </tr>
+  </tbody>
+</table>
 </body>
 </html>
diff --git a/releng/org.eclipse.cdt.releng/testing/customTargets.xml b/releng/org.eclipse.cdt.releng/testing/customTargets.xml
index b8fa302c549..3a1359ac950 100644
--- a/releng/org.eclipse.cdt.releng/testing/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/testing/customTargets.xml
@@ -24,7 +24,9 @@
 <!-- ===================================================================== -->
 
 <target name="assemble.org.eclipse.cdt.testing">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt.testing-${branchVersion}-${buildId}.zip"/>
+	</ant>
 </target>
 
 <!-- ===================================================================== -->