diff --git a/python/testData/inspections/PyArgumentListInspection/badarglist.py b/python/testData/inspections/PyArgumentListInspection/badarglist.py
index 8ac2755a27aa..08bf20f42b00 100644
--- a/python/testData/inspections/PyArgumentListInspection/badarglist.py
+++ b/python/testData/inspections/PyArgumentListInspection/badarglist.py
@@ -18,8 +18,8 @@ def f1():
     pass
 
 f1()
-f1(<warning descr="Unexpected argument">1</warning>)
-f1(<warning descr="Unexpected argument">a = 1</warning>)
+f1<warning descr="Unexpected argument(s)">(<warning descr="Unexpected argument">1</warning>)</warning>
+f1<warning descr="Unexpected argument(s)">(<warning descr="Unexpected argument">a = 1</warning>)</warning>
 
 
 def f2(a):
@@ -28,19 +28,19 @@ def f2(a):
 
 f2(<warning descr="Parameter 'a' unfilled">)</warning> # ok, fail
 f2(1) # ok, pass
-f2(1, <warning descr="Unexpected argument">2</warning>) # ok, fail
+f2<warning descr="Unexpected argument(s)">(1, <warning descr="Unexpected argument">2</warning>)</warning> # ok, fail
 f2(a = 1) # ok, pass
 f2(<warning descr="Unexpected argument">b = 1</warning><warning descr="Parameter 'a' unfilled">)</warning> # ok, fail
-f2(a = 1, <warning descr="Unexpected argument">b = 2</warning>) # ok, fail
+f2<warning descr="Unexpected argument(s)">(a = 1, <warning descr="Unexpected argument">b = 2</warning>)</warning> # ok, fail
 
 
 def f3(a, b):
     pass
 
 f3(1, 2)
-f3(1, 2, <warning descr="Unexpected argument">3</warning>)
+f3<warning descr="Unexpected argument(s)">(1, 2, <warning descr="Unexpected argument">3</warning>)</warning>
 f3(b=2, a=1)
-f3(b=1, <error descr="Keyword argument repeated">b=2</error>, a=1)
+f3<warning descr="Unexpected argument(s)">(b=1, <error descr="Keyword argument repeated">b=2</error>, a=1)</warning>
 f3(1, b=2)
 f3(a=1, <error descr="Positional argument after keyword argument">2</error><warning descr="Parameter 'b' unfilled">)</warning>
 
diff --git a/python/testData/inspections/PyArgumentListInspection/decorators.py b/python/testData/inspections/PyArgumentListInspection/decorators.py
index 9377b5eb8148..6cb33c5d4842 100644
--- a/python/testData/inspections/PyArgumentListInspection/decorators.py
+++ b/python/testData/inspections/PyArgumentListInspection/decorators.py
@@ -13,7 +13,7 @@ def f7():
 def f8():
   pass
 
-@deco(1, <warning descr="Unexpected argument">2</warning>) # fail: extra param
+@deco<warning descr="Unexpected argument(s)">(1, <warning descr="Unexpected argument">2</warning>)</warning> # fail: extra param
 def f9():
   pass
 
@@ -57,7 +57,7 @@ class Dec2:
   def __init__(self, p1, p2):
     pass
 
-@Dec2(<warning descr="Parameter 'p2' unfilled"><warning descr="Parameter 'p1' unfilled">)</warning></warning> # fail: no p1, p2
+@Dec2(<warning descr="Parameter 'p1' unfilled"><warning descr="Parameter 'p2' unfilled">)</warning></warning> # fail: no p1, p2
 def f17():
   pass
 
diff --git a/python/testData/inspections/PyArgumentListInspection/kwargsMapToNothing.py b/python/testData/inspections/PyArgumentListInspection/kwargsMapToNothing.py
index 5029c3b56bd8..c285a60cf423 100644
--- a/python/testData/inspections/PyArgumentListInspection/kwargsMapToNothing.py
+++ b/python/testData/inspections/PyArgumentListInspection/kwargsMapToNothing.py
@@ -5,5 +5,5 @@ arg = [1, 2, 3]
 kwarg = {'c':3}
 f5(*arg, **kwarg) # ok
 f5(1,2, **kwarg) # ok
-f5(1, 2, 3, <warning descr="Unexpected argument">**kwarg</warning>) # fail
-f5(1, 2, 3, <warning descr="Unexpected argument">*arg</warning>) # fail
+f5<warning descr="Unexpected argument(s)">(1, 2, 3, <warning descr="Unexpected argument">**kwarg</warning>)</warning> # fail
+f5<warning descr="Unexpected argument(s)">(1, 2, 3, <warning descr="Unexpected argument">*arg</warning>)</warning> # fail
diff --git a/python/testData/inspections/PyArgumentListInspection/py1268.py b/python/testData/inspections/PyArgumentListInspection/py1268.py
index baaa9fd9e496..951df27428ee 100644
--- a/python/testData/inspections/PyArgumentListInspection/py1268.py
+++ b/python/testData/inspections/PyArgumentListInspection/py1268.py
@@ -3,8 +3,8 @@ def f(a, b, c):
 
 f(c=1, *(10, 20))
 f(*(10, 20), c=1)
-f(*(10, 20, 30), <warning descr="Unexpected argument">c=1</warning>) # fail: duplicate c
-f(1, *(10, 20, <warning descr="Unexpected argument">30</warning>)) # fail: tuple too long
+f<warning descr="Unexpected argument(s)">(*(10, 20, 30), <warning descr="Unexpected argument">c=1</warning>)</warning> # fail: duplicate c
+f<warning descr="Unexpected argument(s)">(1, *(10, 20, <warning descr="Unexpected argument">30</warning>))</warning> # fail: tuple too long
 f(1, <warning descr="Expected an iterable, got int">*(10)</warning>) # fail: wrong type
 f(1, *(10,)<warning descr="Parameter 'c' unfilled">)</warning> # fail: tuple too short, c not mapped
 
@@ -24,14 +24,14 @@ f2(*(1,2), <error descr="Python versions < 3.5 do not allow positional arguments
 def f3(a=1, b=2, c=3, *d):
   return a,b,c,d
 
-f3(c=3, <warning descr="Unexpected argument">a=1</warning>, <warning descr="Unexpected argument">b=2</warning>, *(1,2)) # fail: a and b twice
-f3(1, 2, *(3,), <warning descr="Unexpected argument">c=4</warning>) # fail: c twice
+f3<warning descr="Unexpected argument(s)">(c=3, <warning descr="Unexpected argument">a=1</warning>, <warning descr="Unexpected argument">b=2</warning>, *(1,2))</warning> # fail: a and b twice
+f3<warning descr="Unexpected argument(s)">(1, 2, *(3,), <warning descr="Unexpected argument">c=4</warning>)</warning> # fail: c twice
 f3(1,2,3, *(1,2))
 f3(c=3, *(1,2)) #
-f3(1, <warning descr="Unexpected argument">c=3</warning>, *(1,2)) # fail: c twice
-f3(c=3, a=1, b=2, <warning descr="Unexpected argument">d=(1,2)</warning>) # fail: unexpected d
+f3<warning descr="Unexpected argument(s)">(1, <warning descr="Unexpected argument">c=3</warning>, *(1,2))</warning> # fail: c twice
+f3<warning descr="Unexpected argument(s)">(c=3, a=1, b=2, <warning descr="Unexpected argument">d=(1,2)</warning>)</warning> # fail: unexpected d
 f3(1, c=3, *(10,)) # ZZZ
 f3(1, *(10,))
 f3(1, *(10,), c=20)
 f3(*(1,2), c=20)
-f3(*(1,2), <warning descr="Unexpected argument">a=20</warning>) # fail: a twice
+f3<warning descr="Unexpected argument(s)">(*(1,2), <warning descr="Unexpected argument">a=20</warning>)</warning> # fail: a twice
diff --git a/python/testData/inspections/PyArgumentListInspection/py3k.py b/python/testData/inspections/PyArgumentListInspection/py3k.py
index 70e7820379f0..4ac87031c611 100644
--- a/python/testData/inspections/PyArgumentListInspection/py3k.py
+++ b/python/testData/inspections/PyArgumentListInspection/py3k.py
@@ -19,7 +19,7 @@ def a23(a, *b, c=1):
     pass
 
 a23(1,2,3, c=10) # pass
-a23(1,2,3, c=10, <warning descr="Unexpected argument">a=1</warning>) # fail
+a23<warning descr="Unexpected argument(s)">(1,2,3, c=10, <warning descr="Unexpected argument">a=1</warning>)</warning> # fail
 a23(c=10, a=1) # pass
 a23(c=10, <error descr="Positional argument after keyword argument">1</error><warning descr="Parameter 'a' unfilled">)</warning> # fail
 a23(*args, c=1) # pass
diff --git a/python/testData/inspections/PyArgumentListInspection/tupleVsLiteralList.py b/python/testData/inspections/PyArgumentListInspection/tupleVsLiteralList.py
index d3c41a99bd97..3936d0df1780 100644
--- a/python/testData/inspections/PyArgumentListInspection/tupleVsLiteralList.py
+++ b/python/testData/inspections/PyArgumentListInspection/tupleVsLiteralList.py
@@ -2,4 +2,4 @@ def f20(a, (b, c)):
   pass
 
 f20(1, [2, 3]) # ok
-f20(1, (2, 3, <warning descr="Unexpected argument">4</warning>)) # fail
+f20<warning descr="Unexpected argument(s)">(1, (2, 3, <warning descr="Unexpected argument">4</warning>))</warning> # fail
diff --git a/python/testData/quickFixes/PyRemoveArgumentQuickFixTest/duplicate.py b/python/testData/quickFixes/PyRemoveArgumentQuickFixTest/duplicate.py
index 4716f42c8564..47b5067cc548 100644
--- a/python/testData/quickFixes/PyRemoveArgumentQuickFixTest/duplicate.py
+++ b/python/testData/quickFixes/PyRemoveArgumentQuickFixTest/duplicate.py
@@ -2,4 +2,4 @@ def foo(a, p):
     pass
 
 
-foo(1, p=2, <error descr="Keyword argument repeated">p=3<caret>3</error>)
+foo<warning descr="Unexpected argument(s)">(1, p=2, <error descr="Keyword argument repeated">p=3<caret>3</error>)</warning>
diff --git a/python/testData/quickFixes/PyRemoveArgumentQuickFixTest/unexpected.py b/python/testData/quickFixes/PyRemoveArgumentQuickFixTest/unexpected.py
index 82f42d31e15a..2ae09ef56bce 100644
--- a/python/testData/quickFixes/PyRemoveArgumentQuickFixTest/unexpected.py
+++ b/python/testData/quickFixes/PyRemoveArgumentQuickFixTest/unexpected.py
@@ -2,6 +2,6 @@
 def foo(a):
     pass
 
-foo(1, <warning descr="Unexpected argument">2<caret>3</warning>)
+foo<warning descr="Unexpected argument(s)">(1, <warning descr="Unexpected argument">2<caret>3</warning>)</warning>