diff --git a/idea/resources-fir/META-INF/plugin.xml b/idea/resources-fir/META-INF/plugin.xml
index 1a331b51512..2bda280069c 100644
--- a/idea/resources-fir/META-INF/plugin.xml
+++ b/idea/resources-fir/META-INF/plugin.xml
@@ -73,6 +73,10 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
 
   <extensions defaultExtensionNs="org.jetbrains.kotlin">
     <beforeResolveHighlightingVisitor implementation="org.jetbrains.kotlin.idea.fir.highlighter.visitors.DeclarationHighlightingExtension"/>
+    <binaryExtension implementation="org.jetbrains.kotlin.idea.util.JavaClassBinary"/>
+    <binaryExtension implementation="org.jetbrains.kotlin.idea.util.KotlinBuiltInBinary"/>
+    <binaryExtension implementation="org.jetbrains.kotlin.idea.util.KotlinModuleBinary"/>
+    <binaryExtension implementation="org.jetbrains.kotlin.idea.util.KotlinJsMetaBinary"/>
   </extensions>
 
   <actions>
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt
index a4bdf24dee5..c5489095a3c 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt
@@ -1,7 +1,6 @@
 // PSI_ELEMENT: com.intellij.psi.PsiClass
 // OPTIONS: usages
 // FIND_BY_REF
-// FIR_COMPARISON
 
 package usages
 
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt
index 398b679f773..5ce1a1daa98 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt
@@ -1,2 +1,2 @@
-Local variable declaration 11 val foo: Foo
-Usage in import 8 import library.Foo
\ No newline at end of file
+Local variable declaration 10 val foo: Foo
+Usage in import 7 import library.Foo
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt
index 6411970d056..775fbc07232 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt
@@ -1,7 +1,6 @@
 // PSI_ELEMENT: com.intellij.psi.PsiField
 // OPTIONS: usages
 // FIND_BY_REF
-// FIR_COMPARISON
 
 package usages
 
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt
index f8747371050..2b9298e9885 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt
@@ -1 +1 @@
-Value write 11 Foo(1).x = 1
\ No newline at end of file
+Value write 10 Foo(1).x = 1
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt
index b71927a7011..45c618c8c83 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt
@@ -1,7 +1,6 @@
 // PSI_ELEMENT: com.intellij.psi.PsiField
 // OPTIONS: usages
 // FIND_BY_REF
-// FIR_COMPARISON
 
 package usages
 
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt
index 2f4b1c148a3..3eb163fa26a 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt
@@ -1 +1 @@
-Value write 11 Foo.X = 1
\ No newline at end of file
+Value write 10 Foo.X = 1
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt
index a70fd925969..26041bd259c 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt
@@ -1,7 +1,6 @@
 // PSI_ELEMENT: com.intellij.psi.PsiMethod
 // OPTIONS: usages
 // FIND_BY_REF
-// FIR_COMPARISON
 
 package usages
 
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt
index b286efe759e..0af8714aae3 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt
@@ -1 +1 @@
-Function call 11 Foo.baz(1)
\ No newline at end of file
+Function call 10 Foo.baz(1)
\ No newline at end of file