diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
index f278f50493..74bb98defe 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
@@ -84,6 +84,10 @@ public void testFindConflicting2() throws Exception {
 	}
 
 	public void testSimpleVisibility() throws Exception {
+		boolean stepFilterPref = DebugUITools.isUseStepFilters();
+		if (stepFilterPref) {
+			DebugUITools.setUseStepFilters(false);
+		}
 		String typeName = "LocalVariablesTests";
 
 		ILineBreakpoint bp = createLineBreakpoint(21, typeName);
@@ -116,6 +120,9 @@ public void testSimpleVisibility() throws Exception {
 			assertEquals("Visible var 2 should be 'i2'", "i2", vars[1].getName());
 
 		} finally {
+			if (!stepFilterPref) {
+				DebugUITools.setUseStepFilters(false);
+			}
 			terminateAndRemove(thread);
 			removeAllBreakpoints();
 		}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/sourcelookup/JarSourceLookupTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/sourcelookup/JarSourceLookupTests.java
index 9654138176..2a6a661d71 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/sourcelookup/JarSourceLookupTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/sourcelookup/JarSourceLookupTests.java
@@ -27,6 +27,7 @@
 import org.eclipse.debug.core.model.IStackFrame;
 import org.eclipse.debug.core.model.IValue;
 import org.eclipse.debug.core.sourcelookup.ISourceContainer;
+import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.debug.core.IJavaStackFrame;
 import org.eclipse.jdt.debug.core.IJavaThread;
@@ -186,6 +187,10 @@ public void testTranslateContainers() throws Exception {
 	 * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=346116
 	 */
 	public void testInspectClassFileFromJar() throws Exception {
+		boolean stepFilterPref = DebugUITools.isUseStepFilters();
+		if (stepFilterPref) {
+			DebugUITools.setUseStepFilters(false);
+		}
 		createLaunchConfiguration(fgJarProject, LAUNCHCONFIGURATIONS, A_RUN_JAR);
 		createLineBreakpoint(21, A_RUN_JAR);
 		ILaunchConfiguration config = getLaunchConfiguration(fgJarProject, LAUNCHCONFIGURATIONS, A_RUN_JAR);
@@ -201,6 +206,9 @@ public void testInspectClassFileFromJar() throws Exception {
 			 assertEquals("the name of the type being inspected must be a.JarClass", "a.JarClass", value.getReferenceTypeName());
 		}
 		finally {
+			if (!stepFilterPref) {
+				DebugUITools.setUseStepFilters(false);
+			}
 			terminateAndRemove(thread);
 		}
 	}
@@ -211,6 +219,10 @@ public void testInspectClassFileFromJar() throws Exception {
 	 * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=346116
 	 */
 	public void testShowClassFileFromJar() throws Exception {
+		boolean stepFilterPref = DebugUITools.isUseStepFilters();
+		if (stepFilterPref) {
+			DebugUITools.setUseStepFilters(false);
+		}
 		createLaunchConfiguration(fgJarProject, LAUNCHCONFIGURATIONS, A_RUN_JAR);
 		createLineBreakpoint(21, A_RUN_JAR);
 		ILaunchConfiguration config = getLaunchConfiguration(fgJarProject, LAUNCHCONFIGURATIONS, A_RUN_JAR);
@@ -235,6 +247,9 @@ public void testShowClassFileFromJar() throws Exception {
 				assertEquals("we should have found a file named a.JarClass.class", "JarClass.class", ((ClassFile) source).getElementName());
 		}
 		finally {
+			if (!stepFilterPref) {
+				DebugUITools.setUseStepFilters(false);
+			}
 			terminateAndRemove(thread);
 		}
 	}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPreferenceInitializer.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPreferenceInitializer.java
index 6aa73e6885..dd9b0177e4 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPreferenceInitializer.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPreferenceInitializer.java
@@ -38,7 +38,12 @@ public void initializeDefaultPreferences() {
 		store.setDefault(IJDIPreferencesConstants.PREF_ALERT_UNABLE_TO_INSTALL_BREAKPOINT, true);
 		store.setDefault(IJDIPreferencesConstants.PREF_PROMPT_BEFORE_MODIFYING_FINAL_FIELDS, true);
 		store.setDefault(IJDIPreferencesConstants.PREF_PROMPT_DELETE_CONDITIONAL_BREAKPOINT, true);
+
 		store.setDefault(IJDIPreferencesConstants.PREF_STATEMENT_LEVEL_STEPPING, true);
+		store.setDefault(IJDIPreferencesConstants.PREF_FILTER_SYNTHETICS, true);
+		store.setDefault(IJDIPreferencesConstants.PREF_STEP_THRU_FILTERS, true);
+		store.setDefault(IJDIPreferencesConstants.PREF_FILTER_GETTERS, true);
+		store.setDefault(IJDIPreferencesConstants.PREF_FILTER_SETTERS, true);
 
 		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_QUALIFIED_NAMES, false);
 
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java
index fd53af6b60..5afde5d1c6 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java
@@ -87,7 +87,7 @@ public void init(IWorkbench workbench) {}
 	 */
 	private void createStepFilterPreferences(Composite parent) {
 		Composite container = SWTFactory.createComposite(parent, parent.getFont(), 2, 1, GridData.FILL_BOTH, 0, 0);
-		fUseStepFiltersButton = SWTFactory.createCheckButton(container,	DebugUIMessages.JavaStepFilterPreferencePage__Use_step_filters,	null, DebugUITools.isUseStepFilters(), 2);
+		fUseStepFiltersButton = SWTFactory.createCheckButton(container, DebugUIMessages.JavaStepFilterPreferencePage__Use_step_filters, null, DebugUITools.isUseStepFilters(), 2);
 		fUseStepFiltersButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -189,8 +189,8 @@ public boolean performOk() {
 	@Override
 	protected void performDefaults() {
 		// Cannot use DebugUITools.isUseStepFilters() as this not give the default value, no API from Platform to get the default value
-		fUseStepFiltersButton.setSelection(false);
-		setPageEnablement(false);
+		fUseStepFiltersButton.setSelection(true);
+		setPageEnablement(true);
 		fFilterSyntheticButton.setSelection(getPreferenceStore().getDefaultBoolean(IJDIPreferencesConstants.PREF_FILTER_SYNTHETICS));
 		fFilterStaticButton.setSelection(getPreferenceStore().getDefaultBoolean(IJDIPreferencesConstants.PREF_FILTER_STATIC_INITIALIZERS));
 		fFilterConstructorButton.setSelection(getPreferenceStore().getDefaultBoolean(IJDIPreferencesConstants.PREF_FILTER_CONSTRUCTORS));