diff --git a/java/java-tests/testData/psi/optimizeImports/ImplicitModulesWithImplicitClass.java b/java/java-tests/testData/psi/optimizeImports/ImplicitModulesWithImplicitClass.java
new file mode 100644
index 000000000000..48ec773a890f
--- /dev/null
+++ b/java/java-tests/testData/psi/optimizeImports/ImplicitModulesWithImplicitClass.java
@@ -0,0 +1,5 @@
+import java.util.*;
+
+void main() {
+  List<String> a = new ArrayList<>();
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/optimizeImports/ImplicitModulesWithImplicitClass_after.java b/java/java-tests/testData/psi/optimizeImports/ImplicitModulesWithImplicitClass_after.java
new file mode 100644
index 000000000000..96b92661725f
--- /dev/null
+++ b/java/java-tests/testData/psi/optimizeImports/ImplicitModulesWithImplicitClass_after.java
@@ -0,0 +1,3 @@
+void main() {
+  List<String> a = new ArrayList<>();
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/OptimizeImportsTest.java b/java/java-tests/testSrc/com/intellij/java/psi/OptimizeImportsTest.java
index b26093621857..91a6f0269216 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/OptimizeImportsTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/psi/OptimizeImportsTest.java
@@ -50,7 +50,7 @@ public class OptimizeImportsTest extends OptimizeImportsTestCase {
 
   @Override
   protected @NotNull LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_21;
+    return JAVA_23;
   }
 
   @Override
@@ -126,7 +126,11 @@ public class OptimizeImportsTest extends OptimizeImportsTestCase {
   public void testImplicitIoImport3() {
     implicitIoImport();
   }
-  
+
+  public void testImplicitModulesWithImplicitClass() {
+    doTest();
+  }
+
   public void testNewImportListIsEmptyAndCommentPreserved() { doTest(); }
   public void testNewImportListIsEmptyAndJavaDocWithInvalidCodePreserved() { doTest(); }