diff --git a/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
index a9f3dfa002c..f20bbf92724 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.core.tests.builder;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.jdt.core.tests.compiler;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.ant.core,
+ org.eclipse.pde.api.tools.annotations,
  org.eclipse.pde.ui.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: org.eclipse.pde.api.tools.anttasks.tests;uses:="org.eclipse.core.resources",
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java17tags/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java17tags/META-INF/MANIFEST.MF
index 347671d288a..a54c644b3d5 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java17tags/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java17tags/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: java17tags
 Bundle-SymbolicName: java17tags
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.pde.api.tools.annotations;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: a.b.c
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java17tags/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java17tags/build.properties
index 1d882c37404..1a76f626663 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java17tags/build.properties
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java17tags/build.properties
@@ -13,5 +13,6 @@
 ###############################################################################
 source.. = src/
 output.. = bin/
+additional.bundles = org.eclipse.pde.api.tools.annotations
 bin.includes = META-INF/,\
                .
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java8tags/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java8tags/META-INF/MANIFEST.MF
index e0ca5669d65..473db98a715 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java8tags/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java8tags/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: java8tags
 Bundle-SymbolicName: java8tags
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.pde.api.tools.annotations;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: a.b.c
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java8tags/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java8tags/build.properties
index 6d98c0dd3dd..b430ff64626 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java8tags/build.properties
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tagprojects/java8tags/build.properties
@@ -13,5 +13,6 @@
 ###############################################################################
 source.. = src/
 output.. = bin/
+additional.bundles = org.eclipse.pde.api.tools.annotations
 bin.includes = META-INF/,\
                .
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/META-INF/MANIFEST.MF
index 002512c5a51..1d30672a268 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/META-INF/MANIFEST.MF
@@ -11,5 +11,4 @@ Export-Package: a,
  m,
  pack.multi.part
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.pde.api.tools;bundle-version="1.0.600",
- org.eclipse.pde.api.tools.annotations;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.pde.api.tools;bundle-version="1.0.600"
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/build.properties
index caede8c5709..26f9fc3fb84 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/build.properties
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/build.properties
@@ -12,5 +12,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 source.. = src/
+additional.bundles = org.eclipse.pde.api.tools.annotations
 bin.includes = META-INF/,\
                .,\
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/META-INF/MANIFEST.MF
index ea1a0d75a91..54520fc07a5 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: usagetests
 Bundle-Version: 1.0.0
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: refproject,
- org.eclipse.pde.api.tools.annotations;bundle-version="1.0.0",
  refprojectjava7;bundle-version="1.0.0";resolution:=optional,
  refprojectjava8;bundle-version="1.0.0";resolution:=optional
 Export-Package: internal.x.y.z;x-internal:=true,
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/build.properties
index ded642cf84e..bee679d7b78 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/build.properties
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/build.properties
@@ -13,5 +13,6 @@
 ###############################################################################
 source.. = src/
 output.. = bin/
+additional.bundles = org.eclipse.pde.api.tools.annotations
 bin.includes = META-INF/,\
                .
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/META-INF/MANIFEST.MF
index 8b972c6882f..4ae99bec54f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/META-INF/MANIFEST.MF
@@ -11,5 +11,4 @@ Export-Package: a,
  m,
  pack.multi.part
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.pde.api.tools;bundle-version="1.0.600",
- org.eclipse.pde.api.tools.annotations;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.pde.api.tools;bundle-version="1.0.600"
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/build.properties
index caede8c5709..26f9fc3fb84 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/build.properties
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/refprojectjava7/build.properties
@@ -12,5 +12,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 source.. = src/
+additional.bundles = org.eclipse.pde.api.tools.annotations
 bin.includes = META-INF/,\
                .,\
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/META-INF/MANIFEST.MF
index 82d29239ea8..1c82a09c0fe 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/META-INF/MANIFEST.MF
@@ -4,5 +4,4 @@ Bundle-Name: usageprojectjava7
 Bundle-SymbolicName: usageprojectjava7
 Bundle-Version: 1.0.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: refprojectjava7,
- org.eclipse.pde.api.tools.annotations;bundle-version="1.0.0"
+Require-Bundle: refprojectjava7
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/build.properties
index f422ddf5a4c..e5d007e1a63 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/build.properties
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava7/usageprojectjava7/build.properties
@@ -12,6 +12,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 source.. = src/
+additional.bundles = org.eclipse.pde.api.tools.annotations
 bin.includes = META-INF/,\
                .
 
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/refprojectjava8/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/refprojectjava8/META-INF/MANIFEST.MF
index f23afe7a10d..a9ea0d601b7 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/refprojectjava8/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/refprojectjava8/META-INF/MANIFEST.MF
@@ -5,5 +5,4 @@ Bundle-SymbolicName: refprojectjava8
 Bundle-Version: 1.0.0
 Export-Package: c,i,m
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.pde.api.tools;bundle-version="1.0.600",
- org.eclipse.pde.api.tools.annotations;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.pde.api.tools;bundle-version="1.0.600"
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/refprojectjava8/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/refprojectjava8/build.properties
index 577db40da75..0eeff95ad97 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/refprojectjava8/build.properties
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/refprojectjava8/build.properties
@@ -12,5 +12,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 source.. = src/
+additional.bundles = org.eclipse.jdt.annotation,org.eclipse.pde.api.tools.annotations
 bin.includes = META-INF/,.
-additional.bundles = org.eclipse.jdt.annotation
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/usageprojectjava8/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/usageprojectjava8/META-INF/MANIFEST.MF
index d619684c589..3579bb227cc 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/usageprojectjava8/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/usageprojectjava8/META-INF/MANIFEST.MF
@@ -5,5 +5,4 @@ Bundle-SymbolicName: usageprojectjava8
 Bundle-Version: 1.0.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: refprojectjava8;bundle-version="1.0.0",
- refproject,
- org.eclipse.pde.api.tools.annotations;bundle-version="1.0.0"
+ refproject
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/usageprojectjava8/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/usageprojectjava8/build.properties
index f422ddf5a4c..f8488a15e93 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/usageprojectjava8/build.properties
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojectsjava8/usageprojectjava8/build.properties
@@ -12,6 +12,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 source.. = src/
+additional.bundles = org.eclipse.pde.api.tools.annotations
 bin.includes = META-INF/,\
                .
-