diff --git a/python/testData/fillParagraph/multilineDocstring.py b/python/testData/fillParagraph/multilineDocstring.py
new file mode 100644
index 000000000000..f2e2b56e1e33
--- /dev/null
+++ b/python/testData/fillParagraph/multilineDocstring.py
@@ -0,0 +1,7 @@
+__author__ = 'ktisha'
+
+def foo():
+    """
+    This is my docstring. <caret>There are many like it, but this one mine. My docstring is my best friend. it is my life. I must master it as I must master my life.
+    This is my docstring. There are many like it, but this one mine. My docstring is my best friend. it is my life. I must master it as I must master my life.
+    """
\ No newline at end of file
diff --git a/python/testData/fillParagraph/multilineDocstring_after.py b/python/testData/fillParagraph/multilineDocstring_after.py
new file mode 100644
index 000000000000..07c19cdca980
--- /dev/null
+++ b/python/testData/fillParagraph/multilineDocstring_after.py
@@ -0,0 +1,8 @@
+__author__ = 'ktisha'
+
+def foo():
+    """
+    This is my docstring. There are many like it, but this one mine. My docstring is my best friend. it is my life. I
+     must master it as I must master my life. This is my docstring. There are many like it,
+     but this one mine. My docstring is my best friend. it is my life. I must master it as I must master my life.
+    """
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PyFillParagraphTest.java b/python/testSrc/com/jetbrains/python/PyFillParagraphTest.java
index 9e863d1a6d20..8eb624cf4715 100644
--- a/python/testSrc/com/jetbrains/python/PyFillParagraphTest.java
+++ b/python/testSrc/com/jetbrains/python/PyFillParagraphTest.java
@@ -16,6 +16,10 @@ public class PyFillParagraphTest extends PyTestCase {
     doTest();
   }
 
+  public void _testMultilineDocstring() {
+    doTest();
+  }
+
   public void testDocstringOneParagraph() {
     doTest();
   }