--- tycho-0.16.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF.abk	2013-02-25 09:02:04.000000000 +0100
+++ tycho-0.16.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF	2013-02-25 09:52:56.945987412 +0100
@@ -6,10 +6,10 @@
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Fragment-Host: org.eclipse.tycho.p2.maven.repository
-Require-Bundle: org.junit4;bundle-version="4.8.1",
- org.eclipse.equinox.p2.publisher;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.equinox.p2.publisher;bundle-version="1.2.0",
  org.eclipse.equinox.ds;bundle-version="1.4.0",
- org.eclipse.tycho.p2.resolver.impl
+ org.eclipse.tycho.p2.resolver.impl,
+ org.junit
 Import-Package: org.eclipse.tycho.locking.facade,
  org.eclipse.tycho.repository.test.util,
  org.eclipse.tycho.test.util
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF.bak	2012-10-19 10:07:18.000000000 +0200
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF	2013-02-25 09:57:10.809232586 +0100
@@ -5,7 +5,7 @@
 Bundle-Version: 0.17.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Fragment-Host: org.eclipse.tycho.p2.resolver.impl
-Require-Bundle: org.junit4,
+Require-Bundle: org.junit,
  org.eclipse.equinox.ds,
  org.eclipse.equinox.p2.transport.ecf
 Bundle-ActivationPolicy: lazy
--- org.eclipse.tycho-3351b14f403a08c0e6765081b88b877bf31fcdab/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF.orig	2013-02-25 12:29:06.000000000 +0100
+++ org.eclipse.tycho-3351b14f403a08c0e6765081b88b877bf31fcdab/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF	2013-02-25 12:29:37.091637429 +0100
@@ -6,7 +6,7 @@
 Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  JavaSE-1.6
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.9.0)"
+Require-Bundle: org.junit
 Bundle-ClassPath: jars/surefire-junit3-2.13.jar,
  jars/common-junit3-2.13.jar
 Bundle-Vendor: %providerName