diff --git a/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF b/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
index 1dc9eba..ee7a547 100644
--- a/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
+++ b/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Require-Bundle: org.apache.ant;bundle-version="1.7.1",
org.eclipse.core.variables;bundle-version="3.2.500",
org.jboss.tools.usage;resolution:=optional;x-installation:=greedy
Bundle-ActivationPolicy: lazy
+Eclipse-BundleShape: dir
Bundle-ClassPath: archivescore.jar,
archivescore-eclipse.jar,
lib/concurrent-1.3.4.jar,
diff --git a/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF b/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF
index ec14b1b..dcbbdf9 100644
--- a/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF
+++ b/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jdt.core;bundle-version="3.4.4",
org.jboss.ide.eclipse.archives.jdt.integration;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
+Eclipse-BundleShape: dir
Export-Package: org.jboss.ide.eclipse.archives.test,
org.jboss.ide.eclipse.archives.test.core,
org.jboss.ide.eclipse.archives.test.model,
diff --git a/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml b/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml
index 017c1cf..40f132a 100644
--- a/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml
+++ b/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml
@@ -13,19 +13,4 @@
org.jboss.ide.eclipse.archives.core*
org.jboss.ide.eclipse.archives.core
-
-
-
- org.eclipse.tycho
- tycho-surefire-plugin
-
-
- org.jboss.ide.eclipse.archives.core
- org.jboss.ide.eclipse.archives.test
-
-
-
-
-
-
diff --git a/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MANIFEST.MF b/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MANIFEST.MF
index a481758..4f9d071 100644
--- a/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MANIFEST.MF
+++ b/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.jboss.ide.eclipse.archives.ui.test
Bundle-Version: 3.2.1.qualifier
Bundle-Vendor: JBoss by RedHat
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Eclipse-BundleShape: dir
Require-Bundle: org.junit,
org.jboss.tools.tests,
org.jboss.ide.eclipse.archives.ui,