diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
index 0a5ab2b5e86..76840862ce5 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
@@ -34333,6 +34333,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 runTest("compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBounds.kt");
             }
 
+            @Test
+            @TestMetadata("checkEnhancedUpperBoundsWithEnabledImprovements.kt")
+            public void testCheckEnhancedUpperBoundsWithEnabledImprovements() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBoundsWithEnabledImprovements.kt");
+            }
+
             @Test
             @TestMetadata("concurrentHashMapContains.kt")
             public void testConcurrentHashMapContains() throws Exception {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBounds.kt b/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBounds.kt
index ba54ca91941..f64818275c2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBounds.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBounds.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FULL_JDK
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBoundsWithEnabledImprovements.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBoundsWithEnabledImprovements.fir.kt
new file mode 100644
index 00000000000..9f94e4a8326
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBoundsWithEnabledImprovements.fir.kt
@@ -0,0 +1,17 @@
+// !LANGUAGE: +ImprovementsAroundTypeEnhancement
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+// FULL_JDK
+
+// FILE: MapLike.java
+import java.util.Map;
+
+public interface MapLike<@org.jetbrains.annotations.NotNull K, V> {
+    void putAll(Map<K, V> map);
+}
+
+// FILE: main.kt
+fun test0(map : MapLike<Int?, Int>) {}
+fun <K> test11(map : MapLike<K, K>) {}
+fun <K> test12(map : MapLike<K?, K>) {}
+fun <K : Any> test13(map : MapLike<K, K>) {}
+fun <K : Any> test14(map : MapLike<K?, K>) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBoundsWithEnabledImprovements.kt b/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBoundsWithEnabledImprovements.kt
new file mode 100644
index 00000000000..2f4a92ce002
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBoundsWithEnabledImprovements.kt
@@ -0,0 +1,17 @@
+// !LANGUAGE: +ImprovementsAroundTypeEnhancement
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+// FULL_JDK
+
+// FILE: MapLike.java
+import java.util.Map;
+
+public interface MapLike<@org.jetbrains.annotations.NotNull K, V> {
+    void putAll(Map<K, V> map);
+}
+
+// FILE: main.kt
+fun test0(map : MapLike<<!UPPER_BOUND_VIOLATED!>Int?<!>, Int>) {}
+fun <K> test11(map : MapLike<<!UPPER_BOUND_VIOLATED!>K<!>, K>) {}
+fun <K> test12(map : MapLike<<!UPPER_BOUND_VIOLATED!>K?<!>, K>) {}
+fun <K : Any> test13(map : MapLike<K, K>) {}
+fun <K : Any> test14(map : MapLike<<!UPPER_BOUND_VIOLATED!>K?<!>, K>) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBoundsWithEnabledImprovements.txt b/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBoundsWithEnabledImprovements.txt
new file mode 100644
index 00000000000..bc80a549fca
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBoundsWithEnabledImprovements.txt
@@ -0,0 +1,14 @@
+package
+
+public fun test0(/*0*/ map: MapLike<kotlin.Int?, kotlin.Int>): kotlin.Unit
+public fun </*0*/ K> test11(/*0*/ map: MapLike<K, K>): kotlin.Unit
+public fun </*0*/ K> test12(/*0*/ map: MapLike<K?, K>): kotlin.Unit
+public fun </*0*/ K : kotlin.Any> test13(/*0*/ map: MapLike<K, K>): kotlin.Unit
+public fun </*0*/ K : kotlin.Any> test14(/*0*/ map: MapLike<K?, K>): kotlin.Unit
+
+public interface MapLike</*0*/ @org.jetbrains.annotations.NotNull K : kotlin.Any, /*1*/ V : kotlin.Any!> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public abstract fun putAll(/*0*/ map: kotlin.collections.(Mutable)Map<K, V!>!): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 12b689e3f1c..1f5c983ab43 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -34429,6 +34429,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBounds.kt");
             }
 
+            @Test
+            @TestMetadata("checkEnhancedUpperBoundsWithEnabledImprovements.kt")
+            public void testCheckEnhancedUpperBoundsWithEnabledImprovements() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/java/checkEnhancedUpperBoundsWithEnabledImprovements.kt");
+            }
+
             @Test
             @TestMetadata("concurrentHashMapContains.kt")
             public void testConcurrentHashMapContains() throws Exception {