diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources/messages/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources/messages/InspectionGadgetsBundle.properties
index 5f2f8b2f6e02..078e5fca1a10 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources/messages/InspectionGadgetsBundle.properties
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources/messages/InspectionGadgetsBundle.properties
@@ -1564,8 +1564,8 @@ new.string.buffer.with.char.argument.quickfix=Replace char argument with String
 suspicious.comparator.compare.display.name=Suspicious 'Comparator.compare()' implementation
 suspicious.comparator.compare.descriptor.parameter.not.used=''{0}()'' parameter <code>#ref</code> is not used #loc
 suspicious.comparator.compare.descriptor.non.reflexive=Comparator does not return 0 for equal elements
-suspicious.comparator.compare.descriptor.non.positive=Comparator never returns positive value 
-suspicious.comparator.compare.descriptor.non.negative=Comparator never returns negative value 
+suspicious.comparator.compare.descriptor.non.positive=Comparator never returns positive values 
+suspicious.comparator.compare.descriptor.non.negative=Comparator never returns negative values 
 suspicious.comparator.compare.descriptor.min.value=Returning Integer.MIN_VALUE from a comparison function is discouraged 
 to.array.call.style.display.name='Collection.toArray()' call style
 to.array.call.style.problem.descriptor.zero=Call to <code>#ref()</code> with empty array argument ''{0}'' #loc
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/Comparable.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/Comparable.java
index d6c9209d979d..28f43f23236b 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/Comparable.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/Comparable.java
@@ -1,6 +1,6 @@
 class Test implements Comparable<Test> {
   @Override
-  public int <warning descr="Comparator never returns negative value">compareTo</warning>(Test <warning descr="'compareTo()' parameter 'o' is not used">o</warning>) {
+  public int <warning descr="Comparator never returns negative values">compareTo</warning>(Test <warning descr="'compareTo()' parameter 'o' is not used">o</warning>) {
     return <warning descr="Comparator does not return 0 for equal elements">1</warning>;
   }
 }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/ComparatorIsNotReflexive.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/ComparatorIsNotReflexive.java
index f14f682b255e..cbbbdb094e2f 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/ComparatorIsNotReflexive.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/ComparatorIsNotReflexive.java
@@ -29,7 +29,7 @@ class ComparatorIsNotReflexive implements Comparator<Integer> {
   Comparator<String> lambda3 = (a, b) -> (a.length() > b.length() ? 0 :
                                          <warning descr="Comparator does not return 0 for equal elements">Math.random() > 0.5 ? (-1) : (1)</warning>);
 
-  Comparator<byte[]> arrayComparator = <warning descr="Comparator never returns positive value">(b1, b2)</warning> -> {
+  Comparator<byte[]> arrayComparator = <warning descr="Comparator never returns positive values">(b1, b2)</warning> -> {
     if(b1.length != b2.length) return 0; // typo: == was intended
     return b1.length > b2.length ? 1 : <warning descr="Comparator does not return 0 for equal elements">-1</warning>;
   };
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/ComparatorReturnValue.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/ComparatorReturnValue.java
index 0d5a8d77d07f..8954b098d083 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/ComparatorReturnValue.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/suspicious_comparator_compare/ComparatorReturnValue.java
@@ -16,11 +16,11 @@
 import java.util.Comparator;
 
 class ComparatorReturnValue implements Comparator<Integer> {
-  public int <warning descr="Comparator never returns negative value">compare</warning>(Integer v1, Integer v2) {
+  public int <warning descr="Comparator never returns negative values">compare</warning>(Integer v1, Integer v2) {
     if(v1 > v2) return 1;
     if(v1 < v2) return 2;
     return 0;
   }
 
-  Comparator<String> cmp = <warning descr="Comparator never returns positive value">(s1, s2)</warning> -> s1.equals(s2) ? 0 : s1.charAt(0) < s2.charAt(0) ? -1 : -2;
+  Comparator<String> cmp = <warning descr="Comparator never returns positive values">(s1, s2)</warning> -> s1.equals(s2) ? 0 : s1.charAt(0) < s2.charAt(0) ? -1 : -2;
 }