diff --git a/python/src/com/jetbrains/python/inspections/PyIncorrectDocstringInspection.java b/python/src/com/jetbrains/python/inspections/PyIncorrectDocstringInspection.java
index 8d5a0a2b340b..fa3e2baae971 100644
--- a/python/src/com/jetbrains/python/inspections/PyIncorrectDocstringInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyIncorrectDocstringInspection.java
@@ -31,6 +31,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import static com.jetbrains.python.psi.PyUtil.as;
+
 /**
  * @author Mikhail Golubev
  * @author Alexey.Ivanov
@@ -88,7 +90,8 @@ public class PyIncorrectDocstringInspection extends PyBaseDocstringInspection {
     final List<PyNamedParameter> missing = new ArrayList<PyNamedParameter>();
     final List<String> docStringParameters = docString.getParameters();
     for (PyParameter p : realParams) {
-      if (p.isSelf() || !(p instanceof PyNamedParameter)) {
+      final PyNamedParameter named = as(p, PyNamedParameter.class);
+      if (p.isSelf() || named == null || named.isPositionalContainer() || named.isKeywordContainer()) {
         continue;
       }
       if (!docStringParameters.contains(p.getName())) {
diff --git a/python/testData/inspections/GoogleDocstringParametersInspection/test.py b/python/testData/inspections/GoogleDocstringParametersInspection/test.py
index ab9f8b79ba57..10dfba309e79 100644
--- a/python/testData/inspections/GoogleDocstringParametersInspection/test.py
+++ b/python/testData/inspections/GoogleDocstringParametersInspection/test.py
@@ -59,7 +59,7 @@ def varagrs_dont_exist():
     **<weak_warning descr="Unexpected parameter kwargs in docstring">kwargs</weak_warning>:
   """
   
-def varagrs_undefined(x, <weak_warning descr="Missing parameter args in docstring">*args</weak_warning>, y, <weak_warning descr="Missing parameter kwargs in docstring">**kwargs</weak_warning>):
+def varagrs_undefined(x, *args, y, **kwargs):
   """
   Args:
     x:
diff --git a/python/testData/inspections/PyDocstringParametersInspection/test.py b/python/testData/inspections/PyDocstringParametersInspection/test.py
index 3bd62cf93e11..2a2ba202fee5 100644
--- a/python/testData/inspections/PyDocstringParametersInspection/test.py
+++ b/python/testData/inspections/PyDocstringParametersInspection/test.py
@@ -41,4 +41,11 @@ def foo(a, <weak_warning descr="Missing parameter c in docstring">c</weak_warnin
   @return:
   """
   pass
-  
\ No newline at end of file
+  
+  
+def varargs_undefined(x, *args, y, **kwargs):
+    """
+    @param x:
+    @param y:
+    """
+    pass
diff --git a/python/testSrc/com/jetbrains/python/PyQuickFixTest.java b/python/testSrc/com/jetbrains/python/PyQuickFixTest.java
index e18ce4c13346..9220b567c094 100644
--- a/python/testSrc/com/jetbrains/python/PyQuickFixTest.java
+++ b/python/testSrc/com/jetbrains/python/PyQuickFixTest.java
@@ -519,26 +519,6 @@ public class PyQuickFixTest extends PyTestCase {
     });
   }
 
-  // PY-16761
-  public void testGoogleDocStringAddPositionalVararg() {
-    runWithDocStringFormat(DocStringFormat.GOOGLE, new Runnable() {
-      @Override
-      public void run() {
-        doInspectionTest(PyIncorrectDocstringInspection.class, PyBundle.message("QFIX.docstring.add.$0", "args"), true, true);
-      }
-    });
-  }
-
-  // PY-16761
-  public void testGoogleDocStringAddKeywordVararg() {
-    runWithDocStringFormat(DocStringFormat.GOOGLE, new Runnable() {
-      @Override
-      public void run() {
-        doInspectionTest(PyIncorrectDocstringInspection.class, PyBundle.message("QFIX.docstring.add.$0", "kwargs"), true, true);
-      }
-    });
-  }
-
   // PY-16908
   public void testNumpyDocStringRemoveFirstOfCombinedParams() {
     runWithDocStringFormat(DocStringFormat.NUMPY, new Runnable() {