diff --git a/idea/idea-completion/testData/basic/common/ConsiderExtensionType.kt b/idea/idea-completion/testData/basic/common/ConsiderExtensionType.kt
index 0de335d689e..59936869468 100644
--- a/idea/idea-completion/testData/basic/common/ConsiderExtensionType.kt
+++ b/idea/idea-completion/testData/basic/common/ConsiderExtensionType.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class A
 open class B
 
diff --git a/idea/idea-completion/testData/basic/common/ExtensionWithGenericParamInReceiver.kt b/idea/idea-completion/testData/basic/common/ExtensionWithGenericParamInReceiver.kt
index 03557672980..faa4e54a17a 100644
--- a/idea/idea-completion/testData/basic/common/ExtensionWithGenericParamInReceiver.kt
+++ b/idea/idea-completion/testData/basic/common/ExtensionWithGenericParamInReceiver.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 open class Base
 open class OtherBase
 
diff --git a/idea/idea-completion/testData/basic/common/ExtensionWithGenericReceiver.kt b/idea/idea-completion/testData/basic/common/ExtensionWithGenericReceiver.kt
index 82680b105fa..985bd5cf6dd 100644
--- a/idea/idea-completion/testData/basic/common/ExtensionWithGenericReceiver.kt
+++ b/idea/idea-completion/testData/basic/common/ExtensionWithGenericReceiver.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 open class Base
 open class SubBase:Base()
 open class SubSubBase:SubBase()
diff --git a/idea/idea-completion/testData/basic/common/ExtensionWithInternalGenericParameters.kt b/idea/idea-completion/testData/basic/common/ExtensionWithInternalGenericParameters.kt
index f8a0dd7f7bc..9de86f34f94 100644
--- a/idea/idea-completion/testData/basic/common/ExtensionWithInternalGenericParameters.kt
+++ b/idea/idea-completion/testData/basic/common/ExtensionWithInternalGenericParameters.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 import java.util.HashSet
 
 open class Base
diff --git a/idea/idea-completion/testData/basic/common/ExtensionWithManyTypeParamsInReceiver.kt b/idea/idea-completion/testData/basic/common/ExtensionWithManyTypeParamsInReceiver.kt
index 07f4c12e6c6..aa91adf5027 100644
--- a/idea/idea-completion/testData/basic/common/ExtensionWithManyTypeParamsInReceiver.kt
+++ b/idea/idea-completion/testData/basic/common/ExtensionWithManyTypeParamsInReceiver.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 open class Base
 
 class ManySome<T, U>
diff --git a/idea/idea-completion/testData/basic/common/ExtensionsWithTypeParameterConstraints.kt b/idea/idea-completion/testData/basic/common/ExtensionsWithTypeParameterConstraints.kt
index 43a46982edd..b7e05a5b277 100644
--- a/idea/idea-completion/testData/basic/common/ExtensionsWithTypeParameterConstraints.kt
+++ b/idea/idea-completion/testData/basic/common/ExtensionsWithTypeParameterConstraints.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun <T : Int> T.ext1() {}
 fun <T : String> T.ext2() {}
 
diff --git a/idea/idea-completion/testData/basic/common/GenericCompanionExtension.kt b/idea/idea-completion/testData/basic/common/GenericCompanionExtension.kt
index ac3cc465ee4..57328eeef03 100644
--- a/idea/idea-completion/testData/basic/common/GenericCompanionExtension.kt
+++ b/idea/idea-completion/testData/basic/common/GenericCompanionExtension.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class A<T1, T2> {
     fun foo1() {}
 
diff --git a/idea/idea-completion/testData/basic/common/extensions/ComplexCapture.kt b/idea/idea-completion/testData/basic/common/extensions/ComplexCapture.kt
index 87d0f7e357d..9acd4da1cb1 100644
--- a/idea/idea-completion/testData/basic/common/extensions/ComplexCapture.kt
+++ b/idea/idea-completion/testData/basic/common/extensions/ComplexCapture.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 interface I<T>
 
 fun <E, T : I<E>> T.ext() : T = this
diff --git a/idea/idea-completion/testData/basic/common/extensions/ComplexCapture2.kt b/idea/idea-completion/testData/basic/common/extensions/ComplexCapture2.kt
index 15b8bbcfe2c..c3de2bb4d4f 100644
--- a/idea/idea-completion/testData/basic/common/extensions/ComplexCapture2.kt
+++ b/idea/idea-completion/testData/basic/common/extensions/ComplexCapture2.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 interface D<T>
 
 fun <T1, T2 : D<T1>> T2.ext() {}
diff --git a/idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt b/idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt
index 5d94b5a744f..eed3f509329 100644
--- a/idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt
+++ b/idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun <T> Iterable<T>.first() : T? {
     return this.iterator()?.next()
 }
diff --git a/idea/idea-completion/testData/basic/common/extensions/KotlinGenericTypeExtension.kt b/idea/idea-completion/testData/basic/common/extensions/KotlinGenericTypeExtension.kt
index 8352c7c5cd2..2c043713595 100644
--- a/idea/idea-completion/testData/basic/common/extensions/KotlinGenericTypeExtension.kt
+++ b/idea/idea-completion/testData/basic/common/extensions/KotlinGenericTypeExtension.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun <T> Some<T>.close() {
 }
 
diff --git a/idea/idea-completion/testData/basic/common/extensions/StarTypeArg.kt b/idea/idea-completion/testData/basic/common/extensions/StarTypeArg.kt
index 56632edad6b..4de39589799 100644
--- a/idea/idea-completion/testData/basic/common/extensions/StarTypeArg.kt
+++ b/idea/idea-completion/testData/basic/common/extensions/StarTypeArg.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class MyClass<T>
 
 fun <T> MyClass<T>.ext() = ""
diff --git a/idea/idea-completion/testData/basic/common/primitiveCompletion/genericExtensionPropertyAndFunctionExplicitReceiver.kt b/idea/idea-completion/testData/basic/common/primitiveCompletion/genericExtensionPropertyAndFunctionExplicitReceiver.kt
index 02fb8da11cb..392717a6e31 100644
--- a/idea/idea-completion/testData/basic/common/primitiveCompletion/genericExtensionPropertyAndFunctionExplicitReceiver.kt
+++ b/idea/idea-completion/testData/basic/common/primitiveCompletion/genericExtensionPropertyAndFunctionExplicitReceiver.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun <T : Any> T.anyFun() {}
 val <T : Any> T.anyVal: Int get() = 10
 
diff --git a/idea/idea-completion/testData/basic/common/visibility/KT9970.kt b/idea/idea-completion/testData/basic/common/visibility/KT9970.kt
index dec05fcc00f..1a66d11124f 100644
--- a/idea/idea-completion/testData/basic/common/visibility/KT9970.kt
+++ b/idea/idea-completion/testData/basic/common/visibility/KT9970.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class Z<T> {
     fun f(): Z<T> = ext<caret>
 }
diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelJvmBasicCompletionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelJvmBasicCompletionTestGenerated.java
index a6b80bea8c0..4f40129b48b 100644
--- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelJvmBasicCompletionTestGenerated.java
+++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelJvmBasicCompletionTestGenerated.java
@@ -85,6 +85,11 @@ public class HighLevelJvmBasicCompletionTestGenerated extends AbstractHighLevelJ
             runTest("idea/idea-completion/testData/basic/common/ComponentFunction.kt");
         }
 
+        @TestMetadata("ConsiderExtensionType.kt")
+        public void testConsiderExtensionType() throws Exception {
+            runTest("idea/idea-completion/testData/basic/common/ConsiderExtensionType.kt");
+        }
+
         @TestMetadata("CoroutineContext.kt")
         public void testCoroutineContext() throws Exception {
             runTest("idea/idea-completion/testData/basic/common/CoroutineContext.kt");
@@ -185,6 +190,11 @@ public class HighLevelJvmBasicCompletionTestGenerated extends AbstractHighLevelJ
             runTest("idea/idea-completion/testData/basic/common/ExtensionWithManyTypeParamsInReceiver.kt");
         }
 
+        @TestMetadata("ExtensionsWithTypeParameterConstraints.kt")
+        public void testExtensionsWithTypeParameterConstraints() throws Exception {
+            runTest("idea/idea-completion/testData/basic/common/ExtensionsWithTypeParameterConstraints.kt");
+        }
+
         @TestMetadata("FromImports.kt")
         public void testFromImports() throws Exception {
             runTest("idea/idea-completion/testData/basic/common/FromImports.kt");
@@ -200,6 +210,11 @@ public class HighLevelJvmBasicCompletionTestGenerated extends AbstractHighLevelJ
             runTest("idea/idea-completion/testData/basic/common/FunctionVariableCallArgument.kt");
         }
 
+        @TestMetadata("GenericCompanionExtension.kt")
+        public void testGenericCompanionExtension() throws Exception {
+            runTest("idea/idea-completion/testData/basic/common/GenericCompanionExtension.kt");
+        }
+
         @TestMetadata("GenericExtensionFunReceiver1.kt")
         public void testGenericExtensionFunReceiver1() throws Exception {
             runTest("idea/idea-completion/testData/basic/common/GenericExtensionFunReceiver1.kt");