After re-packaging the OTRE for  Bug 320191 -
  [pde] Exporting an OT plug-in requires to have org.eclipse.objectteams.runtime in the ws:
* Simplify by removing intermediate variable OTRUNTIME_LIBDIR
* Fix regressions in, e.g., OTBuilderTests: when OTRE is served from the projects bin folder,
  a linked folder was inconsistently created 
  (missing in the ws-elementTree - to be checked with JDT/Core team).
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/CompilationOrderTests.java b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/CompilationOrderTests.java
index ab4d1e5..520ef39 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/CompilationOrderTests.java
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/CompilationOrderTests.java
@@ -29,6 +29,7 @@
 import org.eclipse.jdt.core.compiler.CategorizedProblem;
 import org.eclipse.jdt.core.tests.builder.Problem;
 import org.eclipse.jdt.core.tests.util.Util;
+import org.eclipse.objectteams.otdt.tests.ClasspathUtil;
 
 
 public class CompilationOrderTests extends OTBuilderTests {
@@ -51,7 +52,7 @@
 		System.out.println("***** test177otjd5f() *****");
 		IPath projectPath = env.addProject("Project", "1.5"); 
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, ClasspathUtil.OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide
 		env.removePackageFragmentRoot(projectPath, "");
@@ -81,6 +82,7 @@
 	 * Witness for an NPE in ExplicitConstructorCall.resolve():
 	 * If o.o.Team cannot be found, receiverType could be null!
 	 */
+	@SuppressWarnings("nls")
 	public void testMissingOTRE() throws JavaModelException {
 		System.out.println("***** testMissingOTRE() *****");
 		IPath projectPath = env.addProject("Project", "1.5"); 
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/IncrementalTests.java b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/IncrementalTests.java
index 9f7842e..6c45f87 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/IncrementalTests.java
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/IncrementalTests.java
@@ -31,6 +31,7 @@
 import org.eclipse.jdt.core.tests.builder.Problem;
 import org.eclipse.jdt.core.tests.util.Util;
 
+import static org.eclipse.objectteams.otdt.tests.ClasspathUtil.OTRE_PATH;
 /**
  * This test class tests incremental compilation of teams and roles.
  */
@@ -52,7 +53,7 @@
 		System.out.println("***** testRemoveTeamType() *****");
 		IPath projectPath = env.addProject("Project", "1.5"); 
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide
 		env.removePackageFragmentRoot(projectPath, "");
@@ -95,7 +96,7 @@
 		System.out.println("***** testRemoveRoleType() *****");
 		IPath projectPath = env.addProject("Project", "1.5"); 
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide
 		env.removePackageFragmentRoot(projectPath, "");
@@ -140,7 +141,7 @@
 		System.out.println("***** testRemoveRoleFile() *****");
 		IPath projectPath = env.addProject("Project", "1.5"); 
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide
 		env.removePackageFragmentRoot(projectPath, "");
@@ -179,7 +180,7 @@
 		System.out.println("***** testRemoveRoleMethod() *****");
 		IPath projectPath = env.addProject("Project", "1.5");
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide
 		env.removePackageFragmentRoot(projectPath, "");
@@ -240,7 +241,7 @@
 		System.out.println("***** testModifyTSuperRole1() *****");
 		IPath projectPath = env.addProject("Project", "1.5"); 
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide
 		env.removePackageFragmentRoot(projectPath, ""); 
@@ -297,7 +298,7 @@
 		System.out.println("***** testModifyTSuperRole2() *****");
 		IPath projectPath = env.addProject("Project", "1.5"); 
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide
 		env.removePackageFragmentRoot(projectPath, ""); 
@@ -358,7 +359,7 @@
 		System.out.println("***** testModifyTSuperRole3() *****");
 		IPath projectPath = env.addProject("Project", "1.5");
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide 
 		env.removePackageFragmentRoot(projectPath, "");
@@ -425,7 +426,7 @@
 		System.out.println("***** testModifySuperRole1() *****");
 		IPath projectPath = env.addProject("Project", "1.5"); 
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide
 		env.removePackageFragmentRoot(projectPath, ""); 
@@ -478,7 +479,7 @@
 		System.out.println("***** testModifySiblingRole1() *****");
 		IPath projectPath = env.addProject("Project", "1.5"); 
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide
 		env.removePackageFragmentRoot(projectPath, ""); 
@@ -533,7 +534,7 @@
 		System.out.println("***** testModifyTeam1() *****");
 		IPath projectPath = env.addProject("Project", "1.5");
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide
 		env.removePackageFragmentRoot(projectPath, ""); 
@@ -603,7 +604,7 @@
 		System.out.println("***** testAddRoFiToCompiledTeam() *****");
 		IPath projectPath = env.addProject("Project", "1.5");
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide 
 		env.removePackageFragmentRoot(projectPath, "");
@@ -656,7 +657,7 @@
 		System.out.println("***** testAddRoFiToBrokenTeam() *****");
 		IPath projectPath = env.addProject("Project", "1.5");
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 	
 		// remove old package fragment root so that names don't collide 
 		env.removePackageFragmentRoot(projectPath, "");
@@ -718,7 +719,7 @@
 		System.out.println("***** testBreakTeamWithRoFi() *****");
 		IPath projectPath = env.addProject("Project", "1.5");
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 	
 		// remove old package fragment root so that names don't collide 
 		env.removePackageFragmentRoot(projectPath, "");
@@ -763,7 +764,7 @@
 		System.out.println("***** testRoFiExtendsInline() *****");
 		IPath projectPath = env.addProject("Project", "1.5");
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide 
 		env.removePackageFragmentRoot(projectPath, "");
@@ -818,7 +819,7 @@
 		System.out.println("***** testRemoveBoundBaseMethod() *****");
 		IPath projectPath = env.addProject("Project", "1.5");
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide 
 		env.removePackageFragmentRoot(projectPath, "");
@@ -875,7 +876,7 @@
 		System.out.println("***** testPhantomRole() *****");
 		IPath projectPath = env.addProject("Project", "1.5");
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
-		env.addExternalJar(projectPath, OTRE_JAR_PATH);
+		env.addExternalJar(projectPath, OTRE_PATH);
 
 		// remove old package fragment root so that names don't collide 
 		env.removePackageFragmentRoot(projectPath, "");
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTBuilderTests.java b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTBuilderTests.java
index 6399e26..2ebad17 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTBuilderTests.java
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTBuilderTests.java
@@ -21,20 +21,13 @@
 package org.eclipse.objectteams.otdt.test.builder;
 
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.tests.builder.BuilderTests;
 import org.eclipse.jdt.core.tests.builder.Problem;
 import org.eclipse.jdt.core.tests.builder.TestingEnvironment;
-import org.eclipse.objectteams.otdt.core.ext.OTDTPlugin;
 import org.eclipse.objectteams.otdt.internal.compiler.adaptor.BuildManager;
 
 public class OTBuilderTests extends BuilderTests {
 
-	public static final String OTRE_JAR_PATH;
-	static {
-		OTRE_JAR_PATH = JavaCore.getClasspathVariable(OTDTPlugin.OTRE_CONTAINER_PATH).toOSString();
-	}
-	
 	OTTestingEnvironment otenv;
 
 	public OTBuilderTests(String name) {