diff --git a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
index 65c44f73d2e..7b7b8f92b67 100644
--- a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.cdt.make.core.tests;singleton:=true
 Bundle-Version: 7.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.make.core.tests.MakeTestsPlugin
 Export-Package: org.eclipse.cdt.make.builder.tests,
- org.eclipse.cdt.make.core.tests
+ org.eclipse.cdt.make.core.tests,
+ org.eclipse.cdt.make.scannerdiscovery;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
  org.eclipse.cdt.make.core,
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 d3fff01f782..00661aa790f 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
@@ -6,7 +6,8 @@ Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin
 Bundle-Vendor: Eclipse CDT
 Bundle-Localization: plugin
-Export-Package: org.eclipse.cdt.managedbuilder.core.tests,
+Export-Package: org.eclipse.cdt.build.core.scannerconfig.tests;x-internal:=true,
+ org.eclipse.cdt.managedbuilder.core.tests,
  org.eclipse.cdt.managedbuilder.templateengine.tests,
  org.eclipse.cdt.managedbuilder.testplugin,
  org.eclipse.cdt.managedbuilder.tests.suite,
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 fa08a99b27f..ce74fc87eea 100644
--- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Export-Package: org.eclipse.cdt.core.cdescriptor.tests,
  org.eclipse.cdt.core.internal.tests;x-internal:=true,
  org.eclipse.cdt.core.internal.tests.filesystem.ram,
  org.eclipse.cdt.core.language,
+ org.eclipse.cdt.core.language.settings.providers;x-internal:=true,
  org.eclipse.cdt.core.model.tests,
  org.eclipse.cdt.core.parser.tests,
  org.eclipse.cdt.core.parser.tests.ast2,