diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 5d35aeda228..6f3d41eaab0 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -142,42 +142,15 @@
 		<unzip src="${mylynDist}" dest="${testDirectory}/eclipse"/>
 		<unzip src="${zipsdir}/cdt-master-${branchVersion}-${buildId}.zip"
 			dest="${testDirectory}/eclipse"/>
-		<antcall target="unpack-test">
-			<param name="unpackobj" value="org.eclipse.cdt_${branchVersion}.${timestamp}"/>
-			<param name="unpackdir" value="${testDirectory}/eclipse/features"/>
-		</antcall>
-		<antcall target="unpack-test">
-			<param name="unpackobj" value="org.eclipse.cdt.gnu.build_${branchVersion}.${timestamp}"/>
-			<param name="unpackdir" value="${testDirectory}/eclipse/features"/>
-		</antcall>
-		<antcall target="unpack-test">
-			<param name="unpackobj" value="org.eclipse.cdt.gnu.debug_${branchVersion}.${timestamp}"/>
-			<param name="unpackdir" value="${testDirectory}/eclipse/features"/>
-		</antcall>
-		<antcall target="unpack-test">
-			<param name="unpackobj" value="org.eclipse.cdt.platform_${branchVersion}.${timestamp}"/>
-			<param name="unpackdir" value="${testDirectory}/eclipse/features"/>
-		</antcall>
-		<antcall target="unpack-test">
-			<param name="unpackobj" value="org.eclipse.cdt.testing_${branchVersion}.${timestamp}"/>
-			<param name="unpackdir" value="${testDirectory}/eclipse/features"/>
-		</antcall>
-		<antcall target="unpack-test">
-			<param name="unpackobj" value="org.eclipse.cdt.testing_${branchVersion}.${timestamp}"/>
-			<param name="unpackdir" value="${testDirectory}/eclipse/plugins"/>
-		</antcall>
-		<antcall target="unpack-test">
-			<param name="unpackobj" value="${eclipseTest}"/>
-			<param name="unpackdir" value="${testDirectory}/eclipse/plugins"/>
-		</antcall>
-		<delete>
-			<fileset dir="${testDirectory}/eclipse/features" includes="*.jar"/>
-		</delete>
+		<unzip src="${testDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${timestamp}.jar"
+			dest="${testDirectory}/test/cdt"/>
+		<unzip src="${testDirectory}/eclipse/plugins/${eclipseTest}.jar"
+			dest="${testDirectory}/test/eclipse"/>		
 		<delete file="${testDirectory}/eclipse/site.xml"/>
 		<delete file="${testDirectory}/eclipse/pack.properties"/>
-		<ant antfile="test.xml" dir="${testDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${timestamp}">
+		<ant antfile="test.xml" dir="${testDirectory}/test/cdt">
 			<property name="eclipse-home" value="${testDirectory}/eclipse"/>
-			<property name="library-file" value="${testDirectory}/eclipse/plugins/${eclipseTest}/library.xml"/>
+			<property name="library-file" value="${testDirectory}/test/eclipse/library.xml"/>
 			<property name="os" value="${baseos}"/>
 			<property name="ws" value="${basews}"/>
 			<property name="arch" value="${basearch}"/>
@@ -191,12 +164,6 @@
 		<record name="${testReports}/testsLog.txt" action="stop"/>
 	</target>
 	
-	<target name="unpack-test">
-		<unzip src="${unpackdir}/${unpackobj}.jar" dest="${unpackdir}/${unpackobj}"/>
-		<delete file="${unpackdir}/${unpackobj}.jar"/>
-	</target>
-	
-
 	<target name="sign" depends="init" unless="hasErrors">
 		<exec executable="sign">
 			<arg value="/home/data/httpd/download-staging.priv/tools/cdt/releng/results/${buildType}.${buildId}/${masterFile}"/>