diff --git a/java/java-tests/testData/codeInsight/completion/normal/NoExtraArrowMultiCaret.java b/java/java-tests/testData/codeInsight/completion/keywords/noExtraArrowMultiCaret.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/completion/normal/NoExtraArrowMultiCaret.java
rename to java/java-tests/testData/codeInsight/completion/keywords/noExtraArrowMultiCaret.java
diff --git a/java/java-tests/testData/codeInsight/completion/normal/NoExtraArrowMultiCaret_after.java b/java/java-tests/testData/codeInsight/completion/keywords/noExtraArrowMultiCaret_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/completion/normal/NoExtraArrowMultiCaret_after.java
rename to java/java-tests/testData/codeInsight/completion/keywords/noExtraArrowMultiCaret_after.java
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java
index 21600fcd4eae..9106a6d240ee 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java
@@ -172,6 +172,9 @@ public class KeywordCompletionTest extends LightCompletionTestCase {
     checkResultByTestName();
   }
 
+  @NeedsIndex.ForStandardLibrary
+  public void testNoExtraArrowMultiCaret() { doTest(); }
+
   public void testNoPrimitivesInBooleanAnnotationAttribute() { doTest(1, "true", "int", "boolean"); }
   public void testNoPrimitivesInIntAnnotationValueAttribute() { doTest(0, "true", "int", "boolean"); }
   public void testNoPrimitivesInEnumAnnotationAttribute() { doTest(0, "true", "int", "boolean"); }
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalSwitchCompletionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalSwitchCompletionTest.java
index 6a13cc079963..13b706aae6da 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalSwitchCompletionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalSwitchCompletionTest.java
@@ -116,8 +116,6 @@ public class NormalSwitchCompletionTest extends NormalCompletionTestCase {
   public void testDefaultAfterNotNull() { doTest(); }
   public void testDefaultAfterDefault() { doTest(); }
 
-  @NeedsIndex.ForStandardLibrary
-  public void testNoExtraArrowMultiCaret() { doTest(); }
   public void testClassEnumInSwitchInJava20() {
     IdeaTestUtil.withLevel(myFixture.getModule(), LanguageLevel.JDK_20, () -> doTest());
   }