diff --git a/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java b/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java
index 22c27121eea..9c429b5ab27 100644
--- a/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java
@@ -77,6 +77,7 @@ public class JetConfidenceTest extends LightCompletionTestCase {
 
     @Override
     protected void complete() {
-        new CodeCompletionHandlerBase(CompletionType.BASIC, false, true, true).invokeCompletion(getProject(), getEditor(), 0, false, false);
+        new CodeCompletionHandlerBase(CompletionType.BASIC, false, true, true).invokeCompletion(
+                getProject(), getEditor(), 0, false, true);
     }
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/KeywordsHandlerTest.java b/idea/tests/org/jetbrains/jet/completion/handlers/KeywordsHandlerTest.java
index 2454950cd81..8eb5c6d42c6 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/KeywordsHandlerTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/handlers/KeywordsHandlerTest.java
@@ -35,7 +35,7 @@ public class KeywordsHandlerTest extends LightCompletionTestCase {
 
     public void testNoSpaceAfter() throws IOException {
         configureFromFileText("Test.kt", "fun test() { nul<caret> }");
-        complete();
+        forceCompleteFirst();
         checkResultByText("fun test() { null<caret> }");
     }
 
@@ -65,6 +65,13 @@ public class KeywordsHandlerTest extends LightCompletionTestCase {
         checkResultByFile(getTestName(false) + "_after.kt");
     }
 
+    protected void forceCompleteFirst() {
+        complete();
+        if (myItems != null && myItems.length > 1) {
+            selectItem(myItems[0]);
+        }
+    }
+
     @Override
     protected String getTestDataPath() {
         return new File(PluginTestCaseBase.getTestDataPathBase(), "/completion/handlers/keywords").getPath() +