diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListAsList.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListAsList.java
index 05242c299274..760dd9493d8d 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListAsList.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListAsList.java
@@ -5,5 +5,5 @@ import java.util.Collections;
 import java.util.List;
 
 public class Test {
-  public static final List<Number> EVEN = List.<Number>of(2, 4, 6, 8, 10);
+  public static final List<Number> EVEN = List.of(2, 4, 6, 8, 10);
 }
diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListDoubleBrace.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListDoubleBrace.java
index aef70fd2cdea..c9d8eba623d6 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListDoubleBrace.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListDoubleBrace.java
@@ -4,5 +4,5 @@ import java.util.Collections;
 import java.util.List;
 
 public class Test {
-  public static final List<Number> EVEN = List.<Number>of(0, 2, 4, 6, 8);
+  public static final List<Number> EVEN = List.of(0, 2, 4, 6, 8);
 }
diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListExplicit.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListExplicit.java
index d1188ed732b6..29e332c90bcc 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListExplicit.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterArrayListExplicit.java
@@ -4,7 +4,7 @@ import java.util.*;
 public class Test {
   public void testList() {
     List<Integer> list;
-      list = List.<Integer>of(1, 2);
+      list = List.of(1, 2);
     System.out.println(list);
   }
 }
diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterAsList.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterAsList.java
index 4758a7891608..29392eb96ab9 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterAsList.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterAsList.java
@@ -4,5 +4,5 @@ import java.util.Collections;
 import java.util.List;
 
 public class Test {
-  public static final List<Number> EVEN = List.<Number>of(2, 4, 6, 8, 10, 2);
+  public static final List<Number> EVEN = List.of(2, 4, 6, 8, 10, 2);
 }
diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashMap10.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashMap10.java
index 5762f22b378d..b60ebd145309 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashMap10.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashMap10.java
@@ -5,7 +5,7 @@ public class Test {
   public void test() {
     Map<String, String> myMap;
 
-      myMap = Map.<String, String>of("a", "1", "b", "1", "c", "1",
+      myMap = Map.of("a", "1", "b", "1", "c", "1",
 
               // D follows
               "d", "1", "e", /* this is also 1*/ "1", "f", "1", "g", "1", // G is important!
diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashMapSimple.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashMapSimple.java
index 02f6e2e80d3c..a5dcd1da34d4 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashMapSimple.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashMapSimple.java
@@ -4,6 +4,6 @@ import java.util.*;
 public class Test {
   public void test() {
     Map<String, String> myMap;
-      myMap = Map.<String, String>of("a", "b", "c", "b");
+      myMap = Map.of("a", "b", "c", "b");
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetAsList.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetAsList.java
index f5d47c8a7bf5..7f2c1ffa5879 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetAsList.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetAsList.java
@@ -5,5 +5,5 @@ import java.util.HashSet;
 import java.util.Set;
 
 public class Test {
-  public static final Set<String> MY_SET = Set.<String>of("a", "b", "c", Math.random() > 0.5 ? "d" : Math.random() > 0.5 ? "e" : "d");
+  public static final Set<String> MY_SET = Set.of("a", "b", "c", Math.random() > 0.5 ? "d" : Math.random() > 0.5 ? "e" : "d");
 }
diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetDoubleBrace.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetDoubleBrace.java
index 2fa360827e1d..307b38126b1b 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetDoubleBrace.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetDoubleBrace.java
@@ -4,5 +4,5 @@ import java.util.HashSet;
 import java.util.Set;
 
 public class Test {
-  public static final Set<String> MY_SET = Set.<String>of("a", "b", "c".toUpperCase());
+  public static final Set<String> MY_SET = Set.of("a", "b", "c".toUpperCase());
 }
diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetExplicit.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetExplicit.java
index 0144d22d3fb3..81b7dd158366 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetExplicit.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetExplicit.java
@@ -6,6 +6,6 @@ public class Test {
 
   static {
     Set<String> set;
-      MY_SET = Set.<String>of("foo", "bar", "xyz");
+      MY_SET = Set.of("foo", "bar", "xyz");
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetExplicitReusedVar.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetExplicitReusedVar.java
index 8d990faece92..31d4eb7e0032 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetExplicitReusedVar.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterHashSetExplicitReusedVar.java
@@ -4,7 +4,7 @@ import java.util.*;
 public class Test {
   public void test2() {
     Set<String> set;
-      set = Set.<String>of("foo", "bar", "xyz");
+      set = Set.of("foo", "bar", "xyz");
     System.out.println(set);
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterStreamToList.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterStreamToList.java
index b865779c4db6..704e3a80dfa0 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterStreamToList.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterStreamToList.java
@@ -5,5 +5,5 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class Test {
-  public static final List<Class<?>> MY_LIST = List.<Class<?>>of(String.class, int.class, Object.class);
+  public static final List<Class<?>> MY_LIST = List.of(String.class, int.class, Object.class);
 }
diff --git a/java/java-tests/testData/inspection/java9CollectionFactory/afterStreamToSet.java b/java/java-tests/testData/inspection/java9CollectionFactory/afterStreamToSet.java
index 79c8990dae50..343895844464 100644
--- a/java/java-tests/testData/inspection/java9CollectionFactory/afterStreamToSet.java
+++ b/java/java-tests/testData/inspection/java9CollectionFactory/afterStreamToSet.java
@@ -5,5 +5,5 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class Test {
-  public static final Set<Class<?>> MY_SET = Set.<Class<?>>of(String.class, int.class, Object.class);
+  public static final Set<Class<?>> MY_SET = Set.of(String.class, int.class, Object.class);
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/java19api/Java9CollectionFactoryInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/java19api/Java9CollectionFactoryInspectionTest.java
index 488e25ebcfb2..4bf50a0f8b9d 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/java19api/Java9CollectionFactoryInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/java19api/Java9CollectionFactoryInspectionTest.java
@@ -17,7 +17,9 @@ package com.intellij.codeInspection.java19api;
 
 import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
 import com.intellij.codeInspection.LocalInspectionTool;
+import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.pom.java.LanguageLevel;
+import com.intellij.testFramework.IdeaTestUtil;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -35,6 +37,11 @@ public class Java9CollectionFactoryInspectionTest extends LightQuickFixParameter
     return new LocalInspectionTool[]{new Java9CollectionFactoryInspection()};
   }
 
+  @Override
+  protected Sdk getProjectJDK() {
+    return IdeaTestUtil.getMockJdk9();
+  }
+
   public void test() throws Exception {
     doAllTests();
   }