diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
index 4d2745b55e4..3f96cebe294 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
@@ -3,13 +3,14 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core.tests; singleton:=true
 Bundle-Version: 4.0.0.qualifier
-Bundle-ClassPath: mbscoretests.jar
 Bundle-Activator: org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Export-Package: org.eclipse.cdt.managedbuilder.core.tests,
+ org.eclipse.cdt.managedbuilder.templateengine.tests,
  org.eclipse.cdt.managedbuilder.testplugin,
- org.eclipse.cdt.managedbuilder.tests.suite
+ org.eclipse.cdt.managedbuilder.tests.suite,
+ org.eclipse.cdt.projectmodel.tests
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
  org.eclipse.core.resources,
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/build.properties b/build/org.eclipse.cdt.managedbuilder.core.tests/build.properties
index 97eb6665a71..50b23d14443 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/build.properties
@@ -8,14 +8,15 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bin.includes = plugin.xml,\
-               mbscoretests.jar,\
-               resources/,\
+bin.includes = META-INF/,\
                about.html,\
                icons/,\
-               META-INF/,\
-               META-INF/
-jars.compile.order = mbscoretests.jar
-output.mbscoretests.jar = bin/
-source.mbscoretests.jar = suite/,\
-                          tests/
+               plugin.properties,\
+               plugin.xml,\
+               resources/,\
+               .,\
+               testdata/
+jars.compile.order = .
+output.. = bin/
+source.. = suite/,\
+           tests/