295460 Part of build uses default workspace
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 4a5bf42..7aa3a3e 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -161,9 +161,6 @@
             <property
                 name="testRoot"
                 value="${env.PROJECT_TESTS}/${projectname}"/>
-            <property
-                name="performanceRoot"
-                value="${env.BUILD_HOME}/${build.perf.tests}-${buildType}"/>
         </ant>
     </target>
 
@@ -489,7 +486,7 @@
             <jvmarg
                 value="-DnormalizeJarFiles=${normalizeJarFiles}"/>
             <jvmarg
-                value="-Dosgi.instance.area=${buildDirectory}/${buildLabel}/${projectname}-workspace"/>
+                value="-Dosgi.instance.area=${buildDirectory}/${buildLabel}/runbuild-workspace-${component}"/>
             <arg
                 value="-application"/>
             <arg