diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MergeableManifest2Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MergeableManifest2Test.java
index 27f8d9f83..c1a79d8b1 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MergeableManifest2Test.java
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/MergeableManifest2Test.java
@@ -1237,13 +1237,11 @@ public class MergeableManifest2Test {
 				"Bundle-Localization: plugin" + NL + 
 				"Bundle-RequiredExecutionEnvironment: JavaSE-1.8" + NL + 
 				"Export-Package: org.eclipse.xtend.core;x-friends:=\"org.eclipse.xtend.ide.common," + NL + 
-				"   org.eclipse.xtend.caliper.tests," + NL + 
 				"   org.eclipse.xtend.ide.tests\"," + NL + 
 				" org.eclipse.xtend.core.compiler;x-friends:=\"org.eclipse.xtend.m2e," + NL + 
 				"   org.eclipse.xtend.ide.tests\"," + NL + 
 				" org.eclipse.xtend.core.compiler.batch," + NL + 
 				" org.eclipse.xtend.core.conversion;x-friends:=\"org.eclipse.xtend.ide," + NL + 
-				"   org.eclipse.xtend.caliper.tests," + NL + 
 				"   org.eclipse.xtend.ide.common\"," + NL + 
 				" org.eclipse.xtend.core.documentation;x-internal:=true," + NL + 
 				" org.eclipse.xtend.core.findReferences;x-internal:=true," + NL + 
@@ -1253,7 +1251,6 @@ public class MergeableManifest2Test {
 				" org.eclipse.xtend.core.javaconverter;x-friends:=\"org.eclipse.xtend.ide,\"" + NL + 
 				" org.eclipse.xtend.ide.common," + NL + 
 				" org.eclipse.xtend.core.jvmmodel;x-friends:=\"org.eclipse.xtend.ide," + NL + 
-				"   org.eclipse.xtend.caliper.tests," + NL + 
 				"   org.eclipse.xtend.ide.tests," + NL + 
 				"   org.eclipse.xtend.ide.common\"" + NL + 
 				"Require-Bundle: org.eclipse.core.runtime;bundle-version=\"3.13.0\"," + NL + 
@@ -1272,13 +1269,11 @@ public class MergeableManifest2Test {
 				"Bundle-ManifestVersion: 2" + NL + 
 				"Bundle-Name: %pluginName" + NL + 
 				"Export-Package: org.eclipse.xtend.core;x-friends:=\"org.eclipse.xtend.ide.common," + NL + 
-				"   org.eclipse.xtend.caliper.tests," + NL + 
 				"   org.eclipse.xtend.ide.tests\"," + NL + 
 				" org.eclipse.xtend.core.compiler;x-friends:=\"org.eclipse.xtend.m2e," + NL + 
 				"   org.eclipse.xtend.ide.tests\"," + NL + 
 				" org.eclipse.xtend.core.compiler.batch," + NL + 
 				" org.eclipse.xtend.core.conversion;x-friends:=\"org.eclipse.xtend.ide," + NL + 
-				"   org.eclipse.xtend.caliper.tests," + NL + 
 				"   org.eclipse.xtend.ide.common\"," + NL + 
 				" org.eclipse.xtend.core.documentation;x-internal:=true," + NL + 
 				" org.eclipse.xtend.core.findReferences;x-internal:=true," + NL + 
@@ -1288,7 +1283,6 @@ public class MergeableManifest2Test {
 				" org.eclipse.xtend.core.javaconverter;x-friends:=\"org.eclipse.xtend.ide,\"" + NL + 
 				" org.eclipse.xtend.ide.common," + NL + 
 				" org.eclipse.xtend.core.jvmmodel;x-friends:=\"org.eclipse.xtend.ide," + NL + 
-				"   org.eclipse.xtend.caliper.tests," + NL + 
 				"   org.eclipse.xtend.ide.tests," + NL + 
 				"   org.eclipse.xtend.ide.common\"" + NL + 
 				"Require-Bundle: org.eclipse.core.runtime;bundle-version=\"3.13.0\"," + NL + 
@@ -1300,13 +1294,11 @@ public class MergeableManifest2Test {
 				"Bundle-ManifestVersion: 2" + NL + 
 				"Bundle-Name: %pluginName" + NL + 
 				"Export-Package: org.eclipse.xtend.core;x-friends:=\"org.eclipse.xtend.ide.common," + NL + 
-				"   org.eclipse.xtend.caliper.tests," + NL + 
 				"   org.eclipse.xtend.ide.tests\"," + NL + 
 				" org.eclipse.xtend.core.compiler;x-friends:=\"org.eclipse.xtend.m2e," + NL + 
 				"   org.eclipse.xtend.ide.tests\"," + NL + 
 				" org.eclipse.xtend.core.compiler.batch," + NL + 
 				" org.eclipse.xtend.core.conversion;x-friends:=\"org.eclipse.xtend.ide," + NL + 
-				"   org.eclipse.xtend.caliper.tests," + NL + 
 				"   org.eclipse.xtend.ide.common\"," + NL + 
 				" org.eclipse.xtend.core.documentation;x-internal:=true," + NL + 
 				" org.eclipse.xtend.core.findReferences;x-internal:=true," + NL + 
@@ -1316,7 +1308,6 @@ public class MergeableManifest2Test {
 				" org.eclipse.xtend.core.javaconverter;x-friends:=\"org.eclipse.xtend.ide,\"" + NL + 
 				" org.eclipse.xtend.ide.common," + NL + 
 				" org.eclipse.xtend.core.jvmmodel;x-friends:=\"org.eclipse.xtend.ide," + NL + 
-				"   org.eclipse.xtend.caliper.tests," + NL + 
 				"   org.eclipse.xtend.ide.tests," + NL + 
 				"   org.eclipse.xtend.ide.common\"," + NL + 
 				" test" + NL + 
diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF
index 0123246e0..baf9ce7a6 100644
--- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF
@@ -23,7 +23,6 @@ Export-Package: org.eclipse.xtext.util;
    org.eclipse.xtext.tests",
  org.eclipse.xtext.util.internal;x-friends:="org.eclipse.xtext.xtext.generator,
    org.eclipse.xtend.core,
-   org.eclipse.xtend.caliper.tests,
    org.eclipse.xtend.ide,
    org.eclipse.xtend.performance.tests,
    org.eclipse.xtend.ide.tests,
diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF
index 6a209cd9d..6df4ab6e6 100644
--- a/org.eclipse.xtext/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext/META-INF/MANIFEST.MF
@@ -127,7 +127,6 @@ Export-Package: org.eclipse.xtext,
    org.eclipse.xtext.xbase.ui,
    org.eclipse.xtend.core,
    org.eclipse.xtend.ide,
-   org.eclipse.xtend.caliper.tests,
    org.eclipse.xtend.ide.tests,
    org.eclipse.xtext.xtext.ui,
    org.eclipse.xtext.xtext.generator,