diff --git a/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy b/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy
index d36f5061c92f..d647bdbcf46d 100644
--- a/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy
+++ b/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy
@@ -22,9 +22,8 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ModalityState
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import com.intellij.util.ui.UIUtil
-import com.intellij.codeInsight.CodeInsightSettings
 
-/**
+ /**
  * @author peter
  */
 abstract class CompletionAutoPopupTestCase extends LightCodeInsightFixtureTestCase {
@@ -37,7 +36,6 @@ abstract class CompletionAutoPopupTestCase extends LightCodeInsightFixtureTestCa
 
                                  })
     CompletionAutoPopupHandler.ourTestingAutopopup = true
-    CodeInsightSettings.instance.FOCUS_AUTOPOPUP = CodeInsightSettings.SMART
   }
   void superSetUp() {
     super.setUp()
@@ -47,7 +45,6 @@ abstract class CompletionAutoPopupTestCase extends LightCodeInsightFixtureTestCa
   }
 
   @Override protected void tearDown() {
-    CodeInsightSettings.instance.FOCUS_AUTOPOPUP = CodeInsightSettings.NEVER
     CompletionAutoPopupHandler.ourTestingAutopopup = false
     UIUtil.invokeAndWaitIfNeeded(new Runnable(){
                                  @Override
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
index ea9b5afd3e7d..19401e376388 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
@@ -85,7 +85,7 @@ public class CodeInsightSettings implements PersistentStateComponent<Element>, C
   public static final int NONE = 2;
   public static final int FIRST_LETTER = 3;
 
-  public int FOCUS_AUTOPOPUP = NEVER; // NEVER, SMART or ALWAYS
+  public int FOCUS_AUTOPOPUP = SMART; // NEVER, SMART or ALWAYS
   public static final int NEVER = 1;
   public static final int SMART = 2;
   public static final int ALWAYS = 3;