diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java
index e77aa249386e..ed632fed6c5f 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java
@@ -830,6 +830,11 @@ public abstract class ExtractionTestGenerated extends AbstractExtractionTest {
                 runTest("testData/refactoring/extractFunction/basic/classQualifier.kt");
             }
 
+            @TestMetadata("commentPlacement.kt")
+            public void testCommentPlacement() throws Exception {
+                runTest("testData/refactoring/extractFunction/basic/commentPlacement.kt");
+            }
+
             @TestMetadata("companionObjectMemberRef.kt")
             public void testCompanionObjectMemberRef() throws Exception {
                 runTest("testData/refactoring/extractFunction/basic/companionObjectMemberRef.kt");
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/commentPlacement.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/commentPlacement.kt
new file mode 100644
index 000000000000..b81451dd7311
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/commentPlacement.kt
@@ -0,0 +1,10 @@
+
+fun main() {
+    println()
+
+    <selection>// comment
+    if (true) return
+    println()</selection>
+}
+
+// IGNORE_K1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/commentPlacement.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/commentPlacement.kt.after
new file mode 100644
index 000000000000..3b52e5774e6c
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/commentPlacement.kt.after
@@ -0,0 +1,13 @@
+fun main() {
+    println()
+
+    __dummyTestFun__()
+}
+
+private fun __dummyTestFun__() {
+    // comment
+    if (true) return
+    println()
+}
+
+// IGNORE_K1
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/introduceFunction/K2IntroduceFunctionTestGenerated.java b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/introduceFunction/K2IntroduceFunctionTestGenerated.java
index a3239b8e13a4..341bec3544f6 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/introduceFunction/K2IntroduceFunctionTestGenerated.java
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/introduceFunction/K2IntroduceFunctionTestGenerated.java
@@ -51,6 +51,11 @@ public abstract class K2IntroduceFunctionTestGenerated extends AbstractK2Introdu
             runTest("../../idea/tests/testData/refactoring/extractFunction/basic/classQualifier.kt");
         }
 
+        @TestMetadata("commentPlacement.kt")
+        public void testCommentPlacement() throws Exception {
+            runTest("../../idea/tests/testData/refactoring/extractFunction/basic/commentPlacement.kt");
+        }
+
         @TestMetadata("companionObjectMemberRef.kt")
         public void testCompanionObjectMemberRef() throws Exception {
             runTest("../../idea/tests/testData/refactoring/extractFunction/basic/companionObjectMemberRef.kt");