diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.fir.kt
index 15104a1ce9c..f0aebe8fd7a 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.fir.kt
@@ -10,6 +10,8 @@ interface C2 : Common {
 
 fun Common.supertypeExtension() {}
 
+fun <T : Common> T.supertypeExtensionGeneric() {}
+
 context(Common)
 fun supertypeContextual() {}
 
@@ -18,5 +20,6 @@ fun test() {
     supertypeMember()
     member()
     supertypeExtension()
+    supertypeExtensionGeneric()
     supertypeContextual()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.kt
index c3242c0f489..0c071f3c384 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.kt
@@ -10,6 +10,8 @@ interface C2 : Common {
 
 fun Common.supertypeExtension() {}
 
+fun <T : Common> T.supertypeExtensionGeneric() {}
+
 context(Common)
 fun supertypeContextual() {}
 
@@ -18,5 +20,6 @@ fun test() {
     <!OVERLOAD_RESOLUTION_AMBIGUITY!>supertypeMember<!>()
     <!OVERLOAD_RESOLUTION_AMBIGUITY!>member<!>()
     <!AMBIBIGUOS_CALL_WITH_IMPLICIT_CONTEXT_RECEIVER!>supertypeExtension()<!>
+    <!AMBIBIGUOS_CALL_WITH_IMPLICIT_CONTEXT_RECEIVER!>supertypeExtensionGeneric()<!>
     <!MULTIPLE_ARGUMENTS_APPLICABLE_FOR_CONTEXT_RECEIVER!>supertypeContextual()<!>
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.txt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.txt
index 6bcf257f98d..6a76d813ae4 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.txt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.txt
@@ -3,6 +3,7 @@ package
 public fun supertypeContextual(): kotlin.Unit
 public fun test(): kotlin.Unit
 public fun Common.supertypeExtension(): kotlin.Unit
+public fun </*0*/ T : Common> T.supertypeExtensionGeneric(): kotlin.Unit
 
 public interface C1 : Common {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean