diff --git a/java/java-tests/testData/codeInsight/completion/normal/SwitchCaseWithEnumConstant_after.java b/java/java-tests/testData/codeInsight/completion/normal/SwitchCaseWithEnumConstant_after.java
index 43f8fcb29338..c6ed04eeda4e 100644
--- a/java/java-tests/testData/codeInsight/completion/normal/SwitchCaseWithEnumConstant_after.java
+++ b/java/java-tests/testData/codeInsight/completion/normal/SwitchCaseWithEnumConstant_after.java
@@ -2,7 +2,7 @@ class A extends Base{
   void foo(){
     B x = null;
     switch(x){
-        case GOO -> <caret>
+        case GOO:<caret>
     }
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal14CompletionTest.groovy b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal14CompletionTest.groovy
index d971ca31e9f9..04957071907c 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal14CompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal14CompletionTest.groovy
@@ -30,4 +30,8 @@ class Normal14CompletionTest extends NormalCompletionTestCase {
   void testRecordAccessorDeclaration() {
     doTest()
   }
+
+  void testTopLevelPublicRecord() { doTest() }
+  void testTopLevelPublicRecordParenthesisExists() { doTest() }
+  void testTopLevelPublicRecordBraceExists() { doTest() }
 }
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy
index 5b2c3154b6b9..adba2d66be32 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy
@@ -32,7 +32,7 @@ class NormalCompletionTest extends NormalCompletionTestCase {
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_15
+    return JAVA_9
   }
 
   void testSimple() throws Exception {
@@ -954,7 +954,7 @@ public class ListUtils {
   @NeedsIndex.ForStandardLibrary
   void testFinalInForLoop2() throws Throwable {
     configure()
-    myFixture.assertPreferredCompletionItems 1, 'finalize', 'final'
+    myFixture.assertPreferredCompletionItems 0, 'finalize', 'final'
   }
 
   void testOnlyClassesInExtends() throws Throwable {
@@ -2165,8 +2165,4 @@ class Abc {
   void testTopLevelPublicClass() { doTest() }
   void testTopLevelPublicClassIdentifierExists() { doTest() }
   void testTopLevelPublicClassBraceExists() { doTest() }
-
-  void testTopLevelPublicRecord() { doTest() }
-  void testTopLevelPublicRecordParenthesisExists() { doTest() }
-  void testTopLevelPublicRecordBraceExists() { doTest() }
 }