diff --git a/archive/org.eclipse.wtp.releng/buildAll.xml b/archive/org.eclipse.wtp.releng/buildAll.xml
index ed162e1a8d96525c1369ab2ff9b6456055b3751b..6dba06d255bdcc69a0d21cd99b7beaa23ca881fc 100644
--- a/archive/org.eclipse.wtp.releng/buildAll.xml
+++ b/archive/org.eclipse.wtp.releng/buildAll.xml
@@ -452,7 +452,6 @@
             <property name="perf.db" value="-Declipse.perf.dbloc=${perf.dbloc}"/>
             <property name="perf.config.base" value="-Declipse.perf.config=config=${perf.config};build=${buildType}${date}-${time}-base;jvm=${perf.jvm}"/>
             <property name="perf.assert" value="-Declipse.perf.assertAgainst=config=${perf.config};build=${buildType}${date}-${time}-base;jvm=${perf.jvm}"/>
-            <delete dir="${build.home}/derby/eclipseperf" failonerror="false"/>
             <available file="${build.home}/${build.drivers}/${eclipseAutomatedTestsFile}" property="eclipseAutomatedTestsFile.exists"/>
             <antcall target="getEclipseAutomatedTestsFile"/>
             <delete dir="${build.home}/${build.perf.tests}" failonerror="false"/>
diff --git a/archive/org.eclipse.wtp.releng/cruise.xml b/archive/org.eclipse.wtp.releng/cruise.xml
index ad072774749a1220d8da0e2e80a7054d37940492..09e14b454f8e428d0e08ad8f8e58065e595a3e91 100644
--- a/archive/org.eclipse.wtp.releng/cruise.xml
+++ b/archive/org.eclipse.wtp.releng/cruise.xml
@@ -123,7 +123,11 @@
 	<target name="performance6" if="buildId">
 		<property name="timestamp" value="${date}${time}"/>
 		<property name="buildLabel" value="${buildType}-${buildId}-${timestamp}"/>
-		<!--
+		<antcall target="eclipse.performance"/>
+		<antcall target="wtp.performance"/>
+	</target>
+
+	<target name="eclipse.performance" if="run.eclipse.perf">
 		<ant antfile="buildAll.xml" target="eclipsePerf">
 			<property name="build.home" value="${build.home}"/>
 			<property name="buildType" value="${buildType}"/>
@@ -133,7 +137,9 @@
 			<property name="timestamp" value="${timestamp}"/>
 			<property name="buildLabel" value="${buildLabel}"/>
 		</ant>
-		-->
+	</target>
+
+	<target name="wtp.performance" unless="run.eclipse.perf">
 		<ant antfile="buildAll.xml" target="performance">
 			<property name="build.home" value="${build.home}"/>
 			<property name="buildType" value="${buildType}"/>