OT-support added for hierarchy tests.
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/.classpath
index c991626..c04f133 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/.classpath
@@ -6,9 +6,10 @@
 	<classpathentry kind="src" path="compiler"/>
 	<classpathentry kind="src" path="parser"/>
 	<classpathentry kind="src" path="formatter"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="OTRE"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="selection"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/.project b/testplugins/org.eclipse.objectteams.otdt.tests/.project
index fbd0226..2ec63b5 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/.project
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/.project
@@ -6,7 +6,7 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.objectteams.otdt.builder.OTJBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -24,5 +24,6 @@
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.objectteams.otdt.OTJavaNature</nature>
 	</natures>
 </projectDescription>
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.tests/META-INF/MANIFEST.MF
index bd8c1ba..a3395c9 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/META-INF/MANIFEST.MF
@@ -4,18 +4,6 @@
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.tests;singleton:=true
 Bundle-Version: 1.3.0
 Bundle-ClassPath: otdt-tests.jar
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.junit,
- org.eclipse.jdt.core;bundle-version="[3.5.0.v_OTDT_r130,4.0.0)",
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core.tests.compiler,
- org.eclipse.test.performance,
- org.eclipse.objectteams.otdt,
- org.eclipse.jdt.core.tests.builder,
- org.eclipse.objectteams.otdt.debug,
- org.eclipse.text,
- org.eclipse.jdt.core.tests.model
 Bundle-Vendor: The TOPPrax consortium
 Export-Package: org.eclipse.objectteams.otdt.tests,
  org.eclipse.objectteams.otdt.tests.compiler,
@@ -42,4 +30,17 @@
  org.eclipse.objectteams.otdt.tests.selection.codeselect,
  org.eclipse.objectteams.otdt.tests.subhierarchy,
  org.eclipse.objectteams.otdt.tests.superhierarchy
+Require-Bundle: org.junit,
+ org.eclipse.jdt.core;bundle-version="[3.5.0.v_OTDT_r130,4.0.0)",
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.jdt.core.tests.compiler,
+ org.eclipse.test.performance,
+ org.eclipse.objectteams.otdt,
+ org.eclipse.jdt.core.tests.builder,
+ org.eclipse.objectteams.otdt.debug,
+ org.eclipse.text,
+ org.eclipse.jdt.core.tests.model,
+ org.eclipse.objectteams.otequinox
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy