diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/afterNestedReturn.java b/java/java-tests/testData/inspection/switchExpressionMigration/afterNestedReturn.java
new file mode 100644
index 000000000000..ee49aff84df8
--- /dev/null
+++ b/java/java-tests/testData/inspection/switchExpressionMigration/afterNestedReturn.java
@@ -0,0 +1,18 @@
+// "Replace with 'switch' expression" "true"
+
+class NestedReturn {
+  public static int parse(String value) {
+      return switch (value) {
+          case "string" -> 1;
+          case "boolean" -> 1;
+          default -> {
+              String trimmed = value.trim();
+              if (trimmed.endsWith("2113[]")) {
+                  byte ops = 1;
+                  yield ~ops;
+              }
+              throw new IllegalArgumentException(trimmed);
+          }
+      };
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/beforeBrokenSwitchYieldStatement2.java b/java/java-tests/testData/inspection/switchExpressionMigration/beforeBrokenSwitchYieldStatement2.java
index 4691505650a4..d1b9060fbc7f 100644
--- a/java/java-tests/testData/inspection/switchExpressionMigration/beforeBrokenSwitchYieldStatement2.java
+++ b/java/java-tests/testData/inspection/switchExpressionMigration/beforeBrokenSwitchYieldStatement2.java
@@ -1,7 +1,7 @@
 // "Replace with 'switch' expression" "false"
 import java.util.*;
 
-class NestedPatterns {
+class NestedReturn {
   public static List<Class<?>> parse(String value) {
     switc<caret>h (value) {
       case "string":
diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/beforeNestedReturn.java b/java/java-tests/testData/inspection/switchExpressionMigration/beforeNestedReturn.java
new file mode 100644
index 000000000000..1c6a5261ba66
--- /dev/null
+++ b/java/java-tests/testData/inspection/switchExpressionMigration/beforeNestedReturn.java
@@ -0,0 +1,20 @@
+// "Replace with 'switch' expression" "true"
+
+class NestedReturn {
+  public static int parse(String value) {
+    switc<caret>h (value) {
+      case "string":
+        return 1;
+      case "boolean":
+        return 1;
+      default: {
+        String trimmed = value.trim();
+        if (trimmed.endsWith("2113[]")) {
+          byte ops = 1;
+          return ~ops;
+        }
+        throw new IllegalArgumentException(trimmed);
+      }
+    }
+  }
+}
\ No newline at end of file