diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseBlockWithIf.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseBlockWithIf.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseBlockWithIf.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseBlockWithIf.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseBlockWithIf_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseBlockWithIf_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseBlockWithIf_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseBlockWithIf_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithIf.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithIf.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithIf.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithIf.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithIf_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithIf_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithIf_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithIf_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithSynchronized.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithSynchronized.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithSynchronized.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithSynchronized.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithSynchronized_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithSynchronized_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithSynchronized_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithSynchronized_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithBlock.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithBlock.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithBlock.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithBlock.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithBlock_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithBlock_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithBlock_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithBlock_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithIf.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithIf.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithIf.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithIf.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithIf_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithIf_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithIf_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithIf_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithTryCatch.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithTryCatch.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithTryCatch.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithTryCatch.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithTryCatch_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithTryCatch_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithTryCatch_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithTryCatch_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchBlockWithFor.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchBlockWithFor.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchBlockWithFor.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchBlockWithFor.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchBlockWithFor_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchBlockWithFor_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchBlockWithFor_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchBlockWithFor_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchResultWithFor.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchResultWithFor.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchResultWithFor.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchResultWithFor.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchResultWithFor_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchResultWithFor_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchResultWithFor_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchResultWithFor_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithDoWhile.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithDoWhile.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithDoWhile.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithDoWhile.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithDoWhile_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithDoWhile_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithDoWhile_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithDoWhile_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithTryFinally.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithTryFinally.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithTryFinally.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithTryFinally.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithTryFinally_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithTryFinally_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithTryFinally_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithTryFinally_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithRunnable.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithRunnable.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithRunnable.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithRunnable.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithRunnable_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithRunnable_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithRunnable_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithRunnable_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithTryCatchFinally.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithTryCatchFinally.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithTryCatchFinally.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithTryCatchFinally.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithTryCatchFinally_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithTryCatchFinally_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithTryCatchFinally_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithTryCatchFinally_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithWhile.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithWhile.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithWhile.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithWhile.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithWhile_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithWhile_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithWhile_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithWhile_after.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultThrowWithIfElse.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultThrowWithIfElse.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultThrowWithIfElse.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultThrowWithIfElse.java
diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultThrowWithIfElse_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultThrowWithIfElse_after.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultThrowWithIfElse_after.java
rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultThrowWithIfElse_after.java
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/generation/surroundWith/JavaSurroundWith12Test.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/generation/surroundWith/JavaSurroundWith12Test.kt
index b3553c90e5d0..cd40ac01ef53 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/generation/surroundWith/JavaSurroundWith12Test.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/generation/surroundWith/JavaSurroundWith12Test.kt
@@ -10,8 +10,8 @@ import com.intellij.testFramework.LightJavaCodeInsightTestCase
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.util.containers.ContainerUtil
 
-class JavaSurroundWith12Test : LightJavaCodeInsightTestCase() {
-  private val BASE_PATH = "/codeInsight/generation/surroundWith/java12/"
+class JavaSurroundWith13Test : LightJavaCodeInsightTestCase() {
+  private val BASE_PATH = "/codeInsight/generation/surroundWith/java13/"
 
   override fun getProjectDescriptor(): LightProjectDescriptor = JavaFoldingTestCase.JAVA_13