diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
index 022bda3f11..08bc719045 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
@@ -8,11 +8,13 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Fragment-Host: org.eclipse.tycho.p2.maven.repository
 Require-Bundle: org.junit,
  org.hamcrest.core,
- org.eclipse.equinox.p2.publisher,
- org.mockito
+ org.eclipse.equinox.p2.publisher
 Import-Package: org.eclipse.tycho.locking.facade,
  org.eclipse.tycho.repository.local.testutil,
  org.eclipse.tycho.repository.streaming.testutil,
  org.eclipse.tycho.repository.testutil,
- org.eclipse.tycho.test.util
+ org.eclipse.tycho.test.util,
+ org.mockito,
+ org.mockito.stubbing,
+ org.mockito.hamcrest
 Automatic-Module-Name: org.eclipse.tycho.p2.maven.repository.tests
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF
index 5aa0b85c0b..64c8a34f69 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 2.6.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Fragment-Host: org.eclipse.tycho.p2.resolver.shared
 Bundle-Vendor: Eclipse Tycho
-Require-Bundle: org.mockito
 Import-Package: org.junit,
  org.junit.jupiter.api;version:="[5.6.0,6.0.0)"
 Automatic-Module-Name: org.eclipse.tycho.p2.resolver.shared.tests
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
index 2df1218e32..62f02136e3 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
@@ -7,12 +7,14 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Fragment-Host: org.eclipse.tycho.p2.tools.impl
 Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)",
  org.hamcrest.core,
- org.eclipse.tycho.p2.resolver.impl,
- org.mockito
+ org.eclipse.tycho.p2.resolver.impl
 Bundle-Vendor: %providerName
 Import-Package: org.eclipse.tycho,
  org.eclipse.tycho.p2.testutil,
  org.eclipse.tycho.repository.module,
  org.eclipse.tycho.repository.p2base.metadata,
- org.eclipse.tycho.test.util
+ org.eclipse.tycho.test.util,
+ org.mockito,
+ org.mockito.stubbing,
+ org.mockito.invocation
 Automatic-Module-Name: org.eclipse.tycho.p2.tools.tests