diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/plugin.xml b/testplugins/org.eclipse.objectteams.otdt.test.builder/plugin.xml
index 40c5e85..2e2fd3d 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/plugin.xml
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/plugin.xml
@@ -10,7 +10,7 @@
                id="org.eclipse.jdt.core.tests.builder">
          </basePlugin>
          <team
-               activation="ALL_THREADS"
+               activation="NONE"
                class="org.eclipse.objectteams.otdt.test.builder.OTTestingEnvironment"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
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 f1bb882..1e2bb38 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
@@ -26,6 +26,7 @@
 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.internal.compiler.adaptor.BuildManager;
 import org.eclipse.objectteams.otdt.core.ext.OTDTPlugin;
 
@@ -41,6 +42,8 @@
 						+ File.separator
 						+ "otre.jar"; //$NON-NLS-1$
 	}
+	
+	OTTestingEnvironment otenv;
 
 	public OTBuilderTests(String name) {
 		super(name);
@@ -52,13 +55,21 @@
 	protected void setUp() throws Exception {
 		super.setUp();
 		
-		env = new OTTestingEnvironment();
-		env.openEmptyWorkspace();
-		env.resetWorkspace();
+		this.otenv = new OTTestingEnvironment();
+		this.otenv.activate();
+		this.env = new TestingEnvironment();
+		this.env.openEmptyWorkspace();
+		this.env.resetWorkspace();
 	
 		BuildManager.DEBUG = 2;
 	}
 
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		this.otenv.deactivate();
+		this.otenv = null;
+	}
 	/** Verifies that the given element has problems.
 	 * Old implementation from BuilderTests
 	 */