diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 4b785f4b17d..00302ac66b5 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -14,6 +14,7 @@
 		<property name="branchVersion" value="4.0.0"/>
 		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
 		<property name="forceContextQualifier" value="${timestamp}"/>
+		<property name="buildingOSGi" value="true"/>
 		<property name="buildDirectory" value="${basedir}/results" />
 		<property name="baseLocation" value="${buildDirectory}/eclipse"/>
 		<property name="pde.build.scripts" value="${eclipse.home}/plugins/org.eclipse.pde.build/scripts"/>
@@ -24,7 +25,7 @@
 		<property name="buildId" value="${buildType}${timestamp}"/>
 		<property name="zipsdir" value="${buildDirectory}/${buildType}.${buildId}"/>
 		<property name="milestonedir" value="${buildDirectory}/${milestone}"/>
-		<property name="buildingOSGi" value="true"/>
+		<property name="eclipseTest" value="org.eclipse.test_3.2.0"/>
 		<property name="messagefile" value="message.in"/>
 		<property name="mailto" value="cdt-test-dev@eclipse.org"/>
 		<property name="remotedir" value="dschaefer@dev.eclipse.org:cdt/builds/${branchVersion}"/>
@@ -132,14 +133,15 @@
 	</target>
 	
 	<target name="test" depends="init" unless="hasErrors">
-		<antcall target="unpack">
-			<param name="srcPrefix" value="${zipsdir}/cdt-${branchVersion}-${buildId}-${osgi.os}.${osgi.arch}"/>
-			<param name="dest" value="${buildDirectory}"/>
-		</antcall>
-		<unzip src="${zipsdir}/cdt-testing-${branchVersion}-${buildId}.zip" dest="${buildDirectory}"/>
+		<unzip src="${zipsdir}/cdt-master-${branchVersion}-${buildId}.zip"
+			dest="${buildDirectory}/eclipse"/>
+		<unjar src="${buildDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${timestamp}.jar"
+			dest="${buildDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${timestamp}"/>
+		<unjar src="${buildDirectory}/eclipse/plugins/${eclipseTest}.jar"
+			dest="${buildDirectory}/eclipse/plugins/${eclipseTest}"/>
 		<ant antfile="test.xml" dir="${buildDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${forceContextQualifier}">
 			<property name="eclipse-home" value="${buildDirectory}/eclipse"/>
-			<property name="library-file" value="${buildDirectory}/eclipse/plugins/org.eclipse.test_3.2.0/library.xml"/>
+			<property name="library-file" value="${buildDirectory}/eclipse/plugins/${eclipseTest}/library.xml"/>
 			<property name="os" value="${baseos}"/>
 			<property name="ws" value="${basews}"/>
 			<property name="arch" value="${basearch}"/>
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.properties b/releng/org.eclipse.cdt.testing-feature/feature.properties
index 67660c2fc22..b8c1c1a19a7 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.properties
+++ b/releng/org.eclipse.cdt.testing-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse C/C++ Development Tools
+featureName=Eclipse CDT Testing Feature
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
@@ -24,7 +24,7 @@ providerName=Eclipse.org
 updateSiteName=Eclipse CDT Update Site
 
 # "description" property - description of the feature
-description=Eclipse C/C++ development tools. (Binary runtime and user documentation.)
+description=Eclipse C/C++ development tools testing feature.
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page