diff --git a/idea/testData/quickfix/autoImports/importTrait.after.kt b/idea/testData/quickfix/autoImports/importTrait.after.kt
new file mode 100644
index 00000000000..ef35443f576
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/importTrait.after.kt
@@ -0,0 +1,8 @@
+// "Import" "true"
+// ERROR: Unresolved reference: TestTrait
+
+import importTrait.data.TestTrait
+
+fun test() {
+    val a = <caret>TestTrait
+}
diff --git a/idea/testData/quickfix/autoImports/importTrait.before.Main.kt b/idea/testData/quickfix/autoImports/importTrait.before.Main.kt
new file mode 100644
index 00000000000..2ed655fa292
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/importTrait.before.Main.kt
@@ -0,0 +1,6 @@
+// "Import" "true"
+// ERROR: Unresolved reference: TestTrait
+
+fun test() {
+    val a = <caret>TestTrait
+}
diff --git a/idea/testData/quickfix/autoImports/importTrait.before.data.Sample.kt b/idea/testData/quickfix/autoImports/importTrait.before.data.Sample.kt
new file mode 100644
index 00000000000..ca7f9f4bdcb
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/importTrait.before.data.Sample.kt
@@ -0,0 +1,3 @@
+package importTrait.data
+
+trait TestTrait
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java
index 2f1c457f151..60469ae4551 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java
@@ -82,6 +82,11 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
             doTestWithExtraFile("idea/testData/quickfix/autoImports/importInFirstPartInUserType.before.Main.kt");
         }
         
+        @TestMetadata("importTrait.before.Main.kt")
+        public void testImportTrait() throws Exception {
+            doTestWithExtraFile("idea/testData/quickfix/autoImports/importTrait.before.Main.kt");
+        }
+        
         @TestMetadata("noImportForFunInQualifiedNotFirst.before.Main.kt")
         public void testNoImportForFunInQualifiedNotFirst() throws Exception {
             doTestWithExtraFile("idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt");