diff --git a/releng/org.eclipse.cdt.testing/test.xml b/releng/org.eclipse.cdt.testing/test.xml
index 86a3bc957ec..84e2882ec8b 100644
--- a/releng/org.eclipse.cdt.testing/test.xml
+++ b/releng/org.eclipse.cdt.testing/test.xml
@@ -1,10 +1,12 @@
 <project name="CDT Automated Tests" default="run" basedir=".">
 
 	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
+
 	<property name="cdt-core-loc" value="${eclipse-home}/cdt_core_folder"/>
 	<property name="cdt-ui-loc" value="${eclipse-home}/cdt_ui_folder"/>
 	<property name="cdt-debug-ui-loc" value="${eclipse-home}/cdt_debug_ui_folder"/>
-	<property name="cdt-mbs-loc" value="${eclipse-home}/cdt_mbs_folder"/>
+	<property name="cdt-mbs-core-loc" value="${eclipse-home}/cdt_mbs_core_folder"/>
+	<property name="cdt-mbs-ui-loc" value="${eclipse-home}/cdt_mbs_ui_folder"/>
 
 	<target name="init">
 		<tstamp/>
@@ -44,11 +46,19 @@
 		</ant>
 	</target>
 
-	<target name="cdt-mbs" depends="init">
+	<target name="cdt-mbs-core" depends="init">
 		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${cdt-mbs-loc}"/>
+			<property name="data-dir" value="${cdt-mbs-core-loc}"/>
 			<property name="plugin-name" value="org.eclipse.cdt.managedbuilder.core.tests"/>
-			<property name="classname" value="org.eclipse.cdt.managedbuilder.tests.AllManagedBuildTests"/>
+			<property name="classname" value="org.eclipse.cdt.managedbuilder.tests.suite.AllManagedBuildTests"/>
+		</ant>
+	</target>
+
+	<target name="cdt-mbs-ui" depends="init">
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${cdt-mbs-ui-loc}"/>
+			<property name="plugin-name" value="org.eclipse.cdt.managedbuilder.ui.tests"/>
+			<property name="classname" value="org.eclipse.cdt.managedbuilder.ui.tests.suite.AllManagedBuildUITests"/>
 		</ant>
 	</target>
 
@@ -56,7 +66,8 @@
 		<antcall target="cdt-core"/>
 		<antcall target="cdt-ui"/>
 		<antcall target="cdt-debug-ui"/>
-		<antcall target="cdt-mbs"/>
+		<antcall target="cdt-mbs-core"/>
+		<antcall target="cdt-mbs-ui"/>
 	</target>
 
 </project>