diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
index c93f2c5fc0e..d3feaeaef94 100644
--- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
@@ -6,16 +6,33 @@ Bundle-Version: 5.0.0.qualifier
 Bundle-ClassPath: cdtcoretests.jar
 Bundle-Activator: org.eclipse.cdt.core.testplugin.CTestPlugin
 Export-Package: org.eclipse.cdt.core.cdescriptor.tests,
- org.eclipse.cdt.core.internal.errorparsers.tests,
+ org.eclipse.cdt.core.internal.errorparsers.tests;x-internal:=true,
+ org.eclipse.cdt.core.internal.index.provider.test;x-internal:=true,
+ org.eclipse.cdt.core.internal.tests;x-internal:=true,
+ org.eclipse.cdt.core.language,
  org.eclipse.cdt.core.model.failedTests,
  org.eclipse.cdt.core.model.tests,
  org.eclipse.cdt.core.parser.tests,
  org.eclipse.cdt.core.parser.tests.ast2,
  org.eclipse.cdt.core.parser.tests.prefix,
+ org.eclipse.cdt.core.parser.tests.rewrite,
+ org.eclipse.cdt.core.parser.tests.rewrite.astwriter,
+ org.eclipse.cdt.core.parser.tests.rewrite.changegenerator,
+ org.eclipse.cdt.core.parser.tests.rewrite.changegenerator.append,
+ org.eclipse.cdt.core.parser.tests.rewrite.changegenerator.insertbefore,
+ org.eclipse.cdt.core.parser.tests.rewrite.changegenerator.remove,
+ org.eclipse.cdt.core.parser.tests.rewrite.changegenerator.replace,
+ org.eclipse.cdt.core.parser.tests.rewrite.comenthandler,
+ org.eclipse.cdt.core.parser.tests.scanner,
+ org.eclipse.cdt.core.settings.model,
  org.eclipse.cdt.core.suite,
  org.eclipse.cdt.core.testplugin,
  org.eclipse.cdt.core.testplugin.util,
- org.eclipse.cdt.core.tests
+ org.eclipse.cdt.core.tests,
+ org.eclipse.cdt.core.tests.templateengine,
+ org.eclipse.cdt.core.winreg.tests,
+ org.eclipse.cdt.internal.index.tests;x-internal:=true,
+ org.eclipse.cdt.internal.pdom.tests;x-internal:=true
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.cdt.core,
  org.junit,