diff --git a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
index a851ed34c54..e841a7d2411 100644
--- a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit,
- org.eclipse.jdt.core;bundle-version="3.33.0",
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.jdt.core.compiler.batch;bundle-version="3.33.0"
diff --git a/org.eclipse.jdt.core.compiler.batch/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.compiler.batch/META-INF/MANIFEST.MF
index 149e43e94f1..ae397e80c37 100644
--- a/org.eclipse.jdt.core.compiler.batch/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.compiler.batch/META-INF/MANIFEST.MF
@@ -29,4 +29,5 @@ Export-Package: org.eclipse.jdt.core,
  org.eclipse.jdt.internal.compiler.parser.diagnose;x-friends:="org.eclipse.jdt.core",
  org.eclipse.jdt.internal.compiler.problem;x-friends:="org.eclipse.jdt.core",
  org.eclipse.jdt.internal.compiler.tool;x-friends:="org.eclipse.jdt.compiler.tool.tests,org.eclipse.jdt.core",
- org.eclipse.jdt.internal.compiler.util;x-friends:="org.eclipse.jdt.core.internal.tools,org.eclipse.jdt.core"
+ org.eclipse.jdt.internal.compiler.util;x-friends:="org.eclipse.jdt.core.internal.tools,org.eclipse.jdt.core",
+ META-INF.services
diff --git a/org.eclipse.jdt.core.compiler.batch/src/META-INF/services/javax.tools.JavaCompiler b/org.eclipse.jdt.core.compiler.batch/META-INF/services/javax.tools.JavaCompiler
similarity index 100%
rename from org.eclipse.jdt.core.compiler.batch/src/META-INF/services/javax.tools.JavaCompiler
rename to org.eclipse.jdt.core.compiler.batch/META-INF/services/javax.tools.JavaCompiler