diff --git a/java/java-tests/testData/inspection/simplifyCollector/afterMaxByGeneric.java b/java/java-tests/testData/inspection/simplifyCollector/afterMaxByGeneric.java
new file mode 100644
index 000000000000..782fc979c3bd
--- /dev/null
+++ b/java/java-tests/testData/inspection/simplifyCollector/afterMaxByGeneric.java
@@ -0,0 +1,13 @@
+// "Use 'Collectors.toConcurrentMap' collector" "true"
+import java.util.*;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class Test {
+  public static void main(String[] args) {
+    List<String> input = Arrays.asList("a", "bbb", "cc", "ddd", "  x", "ee");
+    Map<Integer, String> map3 = input.stream().collect(Collectors.toConcurrentMap(String::length, Function.identity(), BinaryOperator.maxBy(Comparator.<String>naturalOrder())));
+    System.out.println(map3);
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/simplifyCollector/beforeMaxByGeneric.java b/java/java-tests/testData/inspection/simplifyCollector/beforeMaxByGeneric.java
new file mode 100644
index 000000000000..f8fa34687e69
--- /dev/null
+++ b/java/java-tests/testData/inspection/simplifyCollector/beforeMaxByGeneric.java
@@ -0,0 +1,12 @@
+// "Use 'Collectors.toConcurrentMap' collector" "true"
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class Test {
+  public static void main(String[] args) {
+    List<String> input = Arrays.asList("a", "bbb", "cc", "ddd", "  x", "ee");
+    Map<Integer, String> map3 = input.stream().collect(Collectors.<caret>groupingByConcurrent(String::length, Collectors
+      .collectingAndThen(Collectors.maxBy(Comparator.<String>naturalOrder()), Optional::get)));
+    System.out.println(map3);
+  }
+}
\ No newline at end of file