diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map
index 4f17b3cd20d..c2ef45f142e 100644
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ b/releng/org.eclipse.rse.build/maps/rse.map
@@ -58,7 +58,7 @@ plugin@org.eclipse.rse.subsystems.shells.telnet=v200905272300,:pserver:anonymous
 plugin@org.eclipse.rse.subsystems.terminals.core=v201006041352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.core
 plugin@org.eclipse.rse.subsystems.terminals.ssh=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.ssh
 plugin@org.eclipse.rse.terminals.ui=v201006041352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.terminals.ui
-plugin@org.eclipse.rse.tests=v201006041352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
+plugin@org.eclipse.rse.tests=v201006050745,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
 plugin@org.eclipse.rse.tests.framework=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework
 plugin@org.eclipse.rse.ui=v201005282245,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
 plugin@org.eclipse.rse.useractions=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions
\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/maps/terminal.map b/releng/org.eclipse.rse.build/maps/terminal.map
index 20a6c62f05d..ed434fdc584 100644
--- a/releng/org.eclipse.rse.build/maps/terminal.map
+++ b/releng/org.eclipse.rse.build/maps/terminal.map
@@ -12,5 +12,5 @@ plugin@org.eclipse.tm.terminal.local=v201006041322,:pserver:anonymous:none@dev.e
 plugin@org.eclipse.tm.terminal.serial=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial
 plugin@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh
 plugin@org.eclipse.tm.terminal.telnet=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet
-plugin@org.eclipse.tm.terminal.test=v201006042150,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test
+plugin@org.eclipse.tm.terminal.test=v201006050745,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test
 plugin@org.eclipse.tm.terminal.view=v201006041240,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view
\ No newline at end of file
diff --git a/rse/tests/org.eclipse.rse.tests/test.xml b/rse/tests/org.eclipse.rse.tests/test.xml
index 17ff86c7deb..725c910d93d 100644
--- a/rse/tests/org.eclipse.rse.tests/test.xml
+++ b/rse/tests/org.eclipse.rse.tests/test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
<!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
+     Copyright (c) 2005, 2010 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
      which accompanies this distribution, and is available at
diff --git a/terminal/org.eclipse.tm.terminal.test/test.xml b/terminal/org.eclipse.tm.terminal.test/test.xml
index e778b4f4d33..ed776df77b9 100644
--- a/terminal/org.eclipse.tm.terminal.test/test.xml
+++ b/terminal/org.eclipse.tm.terminal.test/test.xml
@@ -49,13 +49,14 @@ Needs to be updated and tested for org.eclipse.tm.terminal
       <property name="classname" value="${classname}"/>
 	  <property name="extraVMargs" value="-ea"/>
     </ant>
+  	<!-- Plain Junit tests: Commented out until CBI / Athena works
     <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${location}"/>
       <property name="plugin-name" value="${plugin-name}"/>
       <property name="classname" value="org.eclipse.tm.terminal.test.AutomatedTests"/>
 	  <property name="extraVMargs" value="-ea"/>
     </ant>
-    
+    -->
     <!-- UI Tests: Commented out until access to default visible methods works
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${session-folder}"/>
@@ -101,7 +102,7 @@ Needs to be updated and tested for org.eclipse.tm.terminal
   <!-- the tests have been run should go here. -->
   <target name="run" depends="init,suite,cleanup">
     <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org.eclipse.rse.*.xml"/>
+      <property name="includes" value="org.eclipse.tm.*.xml"/>
       <property name="output-file" value="${plugin-name}.xml"/>
     </ant>
   </target>