diff --git a/python/testData/refactoring/extractmethod/CommentsPrecedingSourceStatement.after.py b/python/testData/refactoring/extractmethod/CommentsPrecedingSourceStatement.after.py
new file mode 100644
index 000000000000..dc20cfe1673d
--- /dev/null
+++ b/python/testData/refactoring/extractmethod/CommentsPrecedingSourceStatement.after.py
@@ -0,0 +1,10 @@
+x = 42
+
+# print('commented')
+def func():
+    return x ** 2
+
+
+# comment 1
+# comment 2
+print(func())
\ No newline at end of file
diff --git a/python/testData/refactoring/extractmethod/CommentsPrecedingSourceStatement.before.py b/python/testData/refactoring/extractmethod/CommentsPrecedingSourceStatement.before.py
new file mode 100644
index 000000000000..ff973e3dd7a4
--- /dev/null
+++ b/python/testData/refactoring/extractmethod/CommentsPrecedingSourceStatement.before.py
@@ -0,0 +1,7 @@
+x = 42
+
+# print('commented')
+
+# comment 1
+# comment 2
+print(<selection>x ** 2</selection>)
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyExtractMethodTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyExtractMethodTest.java
index 23e9f78bd958..caee7b09b79c 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/PyExtractMethodTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/PyExtractMethodTest.java
@@ -286,4 +286,8 @@ public class PyExtractMethodTest extends LightMarkedTestCase {
   public void testAwaitExpression() {
     doTest("bar", LanguageLevel.PYTHON35);
   }
+
+  public void testCommentsPrecedingSourceStatement() {
+    doTest("func");
+  }
 }