diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteExperimentalCoroutinesInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteExperimentalCoroutinesInspection.kt
index 36dd77f6129..035ddc06371 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteExperimentalCoroutinesInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteExperimentalCoroutinesInspection.kt
@@ -233,7 +233,8 @@ private class ExperimentalImportUsage : CoroutineMigrationProblem {
         )
 
         private val IMPORTS_TO_REMOVE = setOf(
-            "kotlin.coroutines.experimental.buildSequence"
+            "kotlin.coroutines.experimental.buildSequence",
+            "kotlin.coroutines.experimental.buildIterator"
         )
 
         private const val EXPERIMENTAL_COROUTINES_MARKER = "experimental"
diff --git a/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt b/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt
new file mode 100644
index 00000000000..8a49bbd668d
--- /dev/null
+++ b/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt
@@ -0,0 +1,9 @@
+// "Fix experimental coroutines usage" "true"
+// ERROR: Using 'buildIterator(noinline suspend SequenceScope<T>.() -> Unit): Iterator<T>' is an error. Use 'iterator { }' function instead.
+// WITH_RUNTIME
+import kotlin.coroutines.<caret>experimental.buildIterator
+
+fun main(args: Array<String>) {
+    val lazySeq = buildIterator<Int> {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt.after b/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt.after
new file mode 100644
index 00000000000..bb4bc63b157
--- /dev/null
+++ b/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt.after
@@ -0,0 +1,8 @@
+// "Fix experimental coroutines usage" "true"
+// ERROR: Using 'buildIterator(noinline suspend SequenceScope<T>.() -> Unit): Iterator<T>' is an error. Use 'iterator { }' function instead.
+// WITH_RUNTIME<caret>
+
+fun main(args: Array<String>) {
+    val lazySeq = buildIterator<Int> {
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 52b5ecc9a52..46fbf441632 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -8317,6 +8317,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/obsoleteCoroutines"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
         }
 
+        @TestMetadata("buildIteratorImport.kt")
+        public void testBuildIteratorImport() throws Exception {
+            runTest("idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt");
+        }
+
         @TestMetadata("buildSequence.kt")
         public void testBuildSequence() throws Exception {
             runTest("idea/testData/quickfix/obsoleteCoroutines/buildSequence.kt");