diff --git a/examples/org.eclipse.jface.examples.databinding/META-INF/MANIFEST.MF b/examples/org.eclipse.jface.examples.databinding/META-INF/MANIFEST.MF
index 9e4b98d..de98097 100644
--- a/examples/org.eclipse.jface.examples.databinding/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.jface.examples.databinding/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface.examples.databinding
 Bundle-Version: 1.0.200.qualifier
+Eclipse-BundleShape: dir
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/META-INF/MANIFEST.MF b/tests/org.eclipse.jface.tests.databinding.conformance/META-INF/MANIFEST.MF
index 9dcf5ee..6073d5f 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface.tests.databinding.conformance
 Bundle-Version: 1.1.0.qualifier
+Eclipse-BundleShape: dir
 Require-Bundle: org.junit,
  org.eclipse.core.databinding,
  org.eclipse.jface.databinding,
diff --git a/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF b/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
index 66ddd56..885e180 100644
--- a/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@
 Import-Package: com.ibm.icu.math,
  com.ibm.icu.text
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Eclipse-BundleShape: dir
diff --git a/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF
index b523f6f..d4216ad 100644
--- a/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@
  org.eclipse.ui,
  org.eclipse.ui.browser
 Bundle-ActivationPolicy: lazy
+Eclipse-BundleShape: dir
diff --git a/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF
index 74e4fa8..1aa2611 100755
--- a/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
 Bundle-ClassPath: forms-tests.jar
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-ActivationPolicy: lazy
+Eclipse-BundleShape: dir
diff --git a/tests/org.eclipse.ui.tests.harness/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.harness/META-INF/MANIFEST.MF
index b2a1e17..e68a880 100644
--- a/tests/org.eclipse.ui.tests.harness/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.harness/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@
 Bundle-Name: Harness Plug-in
 Bundle-SymbolicName: org.eclipse.ui.tests.harness;singleton:=true
 Bundle-Version: 1.2.0.qualifier
+Eclipse-BundleShape: dir
 Bundle-Activator: org.eclipse.ui.tests.harness.UITestHarnessPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF
index 66b9c9e..fd55752 100644
--- a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF
@@ -20,3 +20,4 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.ui.tests.navigator
+Eclipse-BundleShape: dir
diff --git a/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF
index 601f73a..8d0504d 100644
--- a/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF
@@ -20,3 +20,4 @@
  org.eclipse.ui.views
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Eclipse-BundleShape: dir
diff --git a/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF
index cdd8ef5..bb73be8 100644
--- a/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
  org.eclipse.ui.tests.rcp.performance,
  org.eclipse.ui.tests.rcp.util
 Bundle-Localization: plugin
+Eclipse-BundleShape: dir
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF
index fd5e356..320a180 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF
@@ -31,4 +31,4 @@
  org.eclipse.ui.tests.views.properties.tabbed.sections,
  org.eclipse.ui.tests.views.properties.tabbed.text,
  org.eclipse.ui.tests.views.properties.tabbed.views
-
+Eclipse-BundleShape: dir
diff --git a/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
index dee9f6c..8b0ed63 100644
--- a/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@
 Bundle-Name: Eclipse UI Tests
 Bundle-SymbolicName: org.eclipse.ui.tests; singleton:=true
 Bundle-Version: 3.7.0.qualifier
+Eclipse-BundleShape: dir
 Bundle-ClassPath: uitests.jar
 Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
 Bundle-Vendor: Eclipse.org