diff --git a/idea/testData/addImport/KeywordNames.dependency.kt b/idea/testData/addImport/KeywordNames.dependency.kt
new file mode 100644
index 00000000000..7c6afc30d4e
--- /dev/null
+++ b/idea/testData/addImport/KeywordNames.dependency.kt
@@ -0,0 +1,3 @@
+package foo.`val`
+
+class `var`
\ No newline at end of file
diff --git a/idea/testData/addImport/KeywordNames.kt b/idea/testData/addImport/KeywordNames.kt
new file mode 100644
index 00000000000..fccd0666d19
--- /dev/null
+++ b/idea/testData/addImport/KeywordNames.kt
@@ -0,0 +1,3 @@
+// IMPORT: class: foo.val.var
+// NAME_COUNT_TO_USE_STAR_IMPORT: 10
+package p
diff --git a/idea/testData/addImport/KeywordNames.kt.after b/idea/testData/addImport/KeywordNames.kt.after
new file mode 100644
index 00000000000..a8441ccee94
--- /dev/null
+++ b/idea/testData/addImport/KeywordNames.kt.after
@@ -0,0 +1,5 @@
+// IMPORT: class: foo.val.var
+// NAME_COUNT_TO_USE_STAR_IMPORT: 10
+package p
+
+import foo.`val`.`var`
diff --git a/idea/testData/editor/optimizeImports/KeywordNames.dependency.kt b/idea/testData/editor/optimizeImports/KeywordNames.dependency.kt
new file mode 100644
index 00000000000..7c6afc30d4e
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/KeywordNames.dependency.kt
@@ -0,0 +1,3 @@
+package foo.`val`
+
+class `var`
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/KeywordNames.kt b/idea/testData/editor/optimizeImports/KeywordNames.kt
new file mode 100644
index 00000000000..0dbb26e6b90
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/KeywordNames.kt
@@ -0,0 +1,3 @@
+import foo.`val`.*
+
+var v: `var`? = null
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/KeywordNames.kt.after b/idea/testData/editor/optimizeImports/KeywordNames.kt.after
new file mode 100644
index 00000000000..0d76a16fb13
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/KeywordNames.kt.after
@@ -0,0 +1,3 @@
+import foo.`val`.`var`
+
+var v: `var`? = null
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java b/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java
index 3c6e85d619f..dc3dc3b35ff 100644
--- a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java
@@ -186,6 +186,12 @@ public class AddImportTestGenerated extends AbstractAddImportTest {
         doTest(fileName);
     }
 
+    @TestMetadata("KeywordNames.kt")
+    public void testKeywordNames() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/KeywordNames.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("NameCountForStarNotReached.kt")
     public void testNameCountForStarNotReached() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/NameCountForStarNotReached.kt");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
index 8945a048f70..0477fb4ef5b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
@@ -111,6 +111,12 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
         doTest(fileName);
     }
 
+    @TestMetadata("KeywordNames.kt")
+    public void testKeywordNames() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KeywordNames.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("KotlinPackage.kt")
     public void testKotlinPackage() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KotlinPackage.kt");