diff --git a/java/java-tests/testData/codeInsight/completion/normal/InsideBreakInSwitchExpression.java b/java/java-tests/testData/codeInsight/completion/normal/InsideYieldInSwitchExpression.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/completion/normal/InsideBreakInSwitchExpression.java
rename to java/java-tests/testData/codeInsight/completion/normal/InsideYieldInSwitchExpression.java
diff --git a/java/java-tests/testData/codeInsight/completion/normal/InsideBreakInSwitchExpression_after.java b/java/java-tests/testData/codeInsight/completion/normal/InsideYieldInSwitchExpression_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/completion/normal/InsideBreakInSwitchExpression_after.java
rename to java/java-tests/testData/codeInsight/completion/normal/InsideYieldInSwitchExpression_after.java
diff --git a/java/java-tests/testData/codeInsight/completion/normal/BreakInSwitchExpression.java b/java/java-tests/testData/codeInsight/completion/normal/YieldInSwitchExpression.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/completion/normal/BreakInSwitchExpression.java
rename to java/java-tests/testData/codeInsight/completion/normal/YieldInSwitchExpression.java
diff --git a/java/java-tests/testData/codeInsight/completion/normal/BreakInSwitchExpression_after.java b/java/java-tests/testData/codeInsight/completion/normal/YieldInSwitchExpression_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/completion/normal/BreakInSwitchExpression_after.java
rename to java/java-tests/testData/codeInsight/completion/normal/YieldInSwitchExpression_after.java
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal12CompletionTest.groovy b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal13CompletionTest.groovy
similarity index 81%
rename from java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal12CompletionTest.groovy
rename to java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal13CompletionTest.groovy
index 24124f06f61c..04e0a71820d8 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal12CompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal13CompletionTest.groovy
@@ -6,7 +6,7 @@ import groovy.transform.CompileStatic
 import org.jetbrains.annotations.NotNull
 
 @CompileStatic
-class Normal12CompletionTest extends NormalCompletionTestCase {
+class Normal13CompletionTest extends NormalCompletionTestCase {
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
@@ -18,7 +18,7 @@ class Normal12CompletionTest extends NormalCompletionTestCase {
   void testSecondLabelInOldSwitch() throws Throwable { doTest() }
   void testSecondLabelInRuleSwitch() throws Throwable { doTest() }
   void testSwitchExpressionStart() throws Throwable { doTest() }
-  void testBreakInSwitchExpression() throws Throwable { doTest() }
-  void testInsideBreakInSwitchExpression() throws Throwable { doTest() }
+  void testYieldInSwitchExpression() throws Throwable { doTest() }
+  void testInsideYieldInSwitchExpression() throws Throwable { doTest() }
   void testInsideRuleInSwitchExpression() throws Throwable { doTest() }
 }
\ No newline at end of file