diff --git a/java/com.sap.sailing.server/META-INF/MANIFEST.MF b/java/com.sap.sailing.server/META-INF/MANIFEST.MF
index bb4325a7ce2..3a960078182 100755
--- a/java/com.sap.sailing.server/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server/META-INF/MANIFEST.MF
@@ -26,11 +26,6 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.operationaltransformation
 Bundle-ClassPath: .
 Export-Package: com.sap.sailing.server,
- com.sap.sailing.server.impl;
-  x-friends:="com.sap.sailing.mongodb.test,
-   com.sap.sailing.server.test,
-   com.sap.sailing.domain.swisstimingadapter.test,
-   com.sap.sailing.gwt.ui.test,
-   com.sap.sailing.server.replication.test",
+ com.sap.sailing.server.impl,
  com.sap.sailing.server.operationaltransformation
 Web-ContextPath: /sailingserver
diff --git a/java/com.sap.sailing.simulator.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.simulator.test/META-INF/MANIFEST.MF
index 80b073d1cf6..b904f8da1f5 100644
--- a/java/com.sap.sailing.simulator.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.simulator.test/META-INF/MANIFEST.MF
@@ -11,5 +11,9 @@ Import-Package: com.sap.sailing.domain.base,
  com.sap.sailing.domain.common,
  com.sap.sailing.domain.common.impl,
  com.sap.sailing.domain.tracking,
+ com.sap.sailing.domain.tracking.impl,
+ com.sap.sailing.domain.tractracadapter,
+ com.sap.sailing.server,
+ com.sap.sailing.server.impl,
  junit.framework;version="4.8.1",
  org.junit;version="4.8.1"