diff --git a/bundles/org.eclipse.equinox.compendium.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.compendium.tests/META-INF/MANIFEST.MF
index bb7486dda03..3683aa4e19b 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.compendium.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 1.2.300.qualifier
 Bundle-Activator: org.eclipse.equinox.compendium.tests.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.junit;bundle-version="4.12.0"
-Eclipse-LazyStart: true
 Import-Package: org.eclipse.equinox.metatype;version="1.2.0",
  org.eclipse.equinox.metatype.impl;version="1.2.0",
  org.eclipse.osgi.tests.bundles,
@@ -20,3 +19,4 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin
 Bundle-Vendor: %bundleVendor
 Automatic-Module-Name: org.eclipse.equinox.compendium.tests
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF
index c89c5d67cd0..98b0e0b67b3 100644
--- a/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.launcher;singleton:=true
 Bundle-Version: 1.6.500.qualifier
 Main-Class: org.eclipse.equinox.launcher.Main
-Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: launcher