diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/PreferenceInitializer.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/PreferenceInitializer.java
index 6dfa817953..18c2b7fb4d 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/PreferenceInitializer.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/PreferenceInitializer.java
@@ -32,7 +32,7 @@ public void initializeDefaultPreferences() {
 		prefs.putBoolean(ILaunchingPreferenceConstants.PROP_JUNIT_WORKSPACE_LOCATION_IS_CONTAINER, false);
 		prefs.put(ILaunchingPreferenceConstants.PROP_JUNIT_LAUNCH_WITH, ILaunchingPreferenceConstants.VALUE_JUNIT_LAUNCH_WITH_TESTPLUGIN);
 		prefs.putBoolean(ILaunchingPreferenceConstants.PROP_JUNIT_AUTO_INCLUDE, true);
-		prefs.putBoolean(ILaunchingPreferenceConstants.PROP_JUNIT_INCLUDE_OPTIONAL, true);
+		prefs.putBoolean(ILaunchingPreferenceConstants.PROP_JUNIT_INCLUDE_OPTIONAL, false);
 		prefs.putBoolean(ILaunchingPreferenceConstants.PROP_JUNIT_ADD_NEW_WORKSPACE_PLUGINS, false);
 		prefs.putBoolean(ILaunchingPreferenceConstants.PROP_JUNIT_VALIDATE_LAUNCH, true);
 		prefs.putBoolean(ILaunchingPreferenceConstants.ADD_SWT_NON_DISPOSAL_REPORTING, true);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/LaunchingPreferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/LaunchingPreferencePage.java
index 6da6486e1c..3065ba009f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/LaunchingPreferencePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/LaunchingPreferencePage.java
@@ -103,7 +103,7 @@ public void createControl(Composite parent) {
 			fJunitAutoIncludeRequirementsButton = SWTFactory.createCheckButton(options,
 					PDEUIMessages.AdvancedLauncherTab_autoIncludeRequirements_plugins, null, true, 1);
 			fJunitIncludeOptionalButton = SWTFactory.createCheckButton(options,
-					PDEUIMessages.AdvancedLauncherTab_includeOptional_plugins, null, true, 1);
+					PDEUIMessages.AdvancedLauncherTab_includeOptional_plugins, null, false, 1);
 			fJunitAddWorkspaceButton = SWTFactory.createCheckButton(options,
 					PDEUIMessages.AdvancedLauncherTab_addNew_plugins, null, false, 1);
 			fJunitAutoValidate = SWTFactory.createCheckButton(options,