try to avoid patching jdt.ui.tests by using a small team instead.
diff --git a/releng/map/otdt.map b/releng/map/otdt.map
index b027168..035f85e 100644
--- a/releng/map/otdt.map
+++ b/releng/map/otdt.map
@@ -48,7 +48,6 @@
 

 plugin@org.eclipse.jdt.core.tests.compiler,3.4.0=SVN,url=file://localhost/svnroot/tools/org.eclipse.objectteams/,path=testplugins/org.eclipse.jdt.core.tests.compiler

 plugin@org.eclipse.jdt.core.tests.model,3.4.0=SVN,url=file://localhost/svnroot/tools/org.eclipse.objectteams/,path=testplugins/org.eclipse.jdt.core.tests.model

-plugin@org.eclipse.jdt.ui.tests,3.6.0=SVN,url=file://localhost/svnroot/tools/org.eclipse.objectteams/,path=testplugins/org.eclipse.jdt.ui.tests

 plugin@org.eclipse.jdt.ui.tests.refactoring,3.6.0=SVN,url=file://localhost/svnroot/tools/org.eclipse.objectteams/,path=testplugins/org.eclipse.jdt.ui.tests.refactoring

 plugin@org.eclipse.objectteams.otdt.tests,0.7.0=SVN,url=file://localhost/svnroot/tools/org.eclipse.objectteams/,path=testplugins/org.eclipse.objectteams.otdt.tests

 plugin@org.eclipse.objectteams.otdt.ui.tests.dom,0.7.0=SVN,url=file://localhost/svnroot/tools/org.eclipse.objectteams/,path=testplugins/org.eclipse.objectteams.otdt.ui.tests.dom

@@ -58,10 +57,12 @@
 !plugin@org.eclipse.test.performance=SVN,url=file://localhost/svnroot/tools/org.eclipse.objectteams/,path=testplugins/org.eclipse.test.performance

 !plugin@org.eclipse.jdt.core.tests.builder=SVN,url=file://localhost/svnroot/tools/org.eclipse.objectteams/,path=testplugins/org.eclipse.jdt.core.tests.builder

 !plugin@org.eclipse.jdt.debug.tests=SVN,url=file://localhost/svnroot/tools/org.eclipse.objectteams/,path=testplugins/org.eclipse.jdt.debug.tests

+!plugin@org.eclipse.jdt.ui.tests,3.6.0=SVN,url=file://localhost/svnroot/tools/org.eclipse.objectteams/,path=testplugins/org.eclipse.jdt.ui.tests

 

 !-- .. but from original CVS:

 plugin@org.eclipse.jdt.core.tests.builder=v_B14a,/cvsroot/eclipse,

 plugin@org.eclipse.jdt.debug.tests=v20100526,/cvsroot/eclipse,

+plugin@org.eclipse.jdt.ui.tests=v20100912-2000,/cvsroot/eclipse,

 

 !-- not compiled but taken from org.eclipse.test:

 !plugin@org.eclipse.test.performance=v20100122,/cvsroot/eclipse,