diff --git a/idea/testData/completion/handlers/charFilter/InfixCallAndSpace.kt b/idea/testData/completion/handlers/charFilter/InfixCallAndSpace.kt
new file mode 100644
index 00000000000..7fbd87a2db0
--- /dev/null
+++ b/idea/testData/completion/handlers/charFilter/InfixCallAndSpace.kt
@@ -0,0 +1,9 @@
+fun <A, B> A.to(that: B): Pair<A, B> = Pair(this, that)
+
+fun foo() {
+    val pair = 1 <caret>
+}
+
+// ELEMENT: to
+// CHAR: ' '
+
diff --git a/idea/testData/completion/handlers/charFilter/InfixCallAndSpace.kt.after b/idea/testData/completion/handlers/charFilter/InfixCallAndSpace.kt.after
new file mode 100644
index 00000000000..042280203c8
--- /dev/null
+++ b/idea/testData/completion/handlers/charFilter/InfixCallAndSpace.kt.after
@@ -0,0 +1,9 @@
+fun <A, B> A.to(that: B): Pair<A, B> = Pair(this, that)
+
+fun foo() {
+    val pair = 1 to <caret>
+}
+
+// ELEMENT: to
+// CHAR: ' '
+
diff --git a/idea/testData/completion/handlers/charFilter/KeywordAndSpace.kt b/idea/testData/completion/handlers/charFilter/KeywordAndSpace.kt
new file mode 100644
index 00000000000..5ab0dcbfbdd
--- /dev/null
+++ b/idea/testData/completion/handlers/charFilter/KeywordAndSpace.kt
@@ -0,0 +1,4 @@
+c<caret>
+
+// ELEMENT: class
+// CHAR: ' '
diff --git a/idea/testData/completion/handlers/charFilter/KeywordAndSpace.kt.after b/idea/testData/completion/handlers/charFilter/KeywordAndSpace.kt.after
new file mode 100644
index 00000000000..2fea7bfbd2a
--- /dev/null
+++ b/idea/testData/completion/handlers/charFilter/KeywordAndSpace.kt.after
@@ -0,0 +1,4 @@
+class <caret>
+
+// ELEMENT: class
+// CHAR: ' '
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java
index 1ffaaa126d1..f01f13cd712 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java
@@ -19,6 +19,7 @@ package org.jetbrains.jet.completion.handlers;
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
 import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -137,6 +138,18 @@ public class CompletionCharFilterTestGenerated extends AbstractCompletionCharFil
         doTest(fileName);
     }
 
+    @TestMetadata("InfixCallAndSpace.kt")
+    public void testInfixCallAndSpace() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/charFilter/InfixCallAndSpace.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("KeywordAndSpace.kt")
+    public void testKeywordAndSpace() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/charFilter/KeywordAndSpace.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("LParenth.kt")
     public void testLParenth() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/charFilter/LParenth.kt");