diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryTestConfigurator.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryTestConfigurator.kt
index 3885d1ab7d5..cfa1caeec17 100644
--- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryTestConfigurator.kt
+++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryTestConfigurator.kt
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.analysis.test.framework.services.libraries.TestModul
 import org.jetbrains.kotlin.analysis.test.framework.services.libraries.TestModuleDecompilerJar
 import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.model.DependencyKind
 import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.preprocessors.ExternalAnnotationsSourcePreprocessor
 import org.jetbrains.kotlin.test.services.TestModuleStructure
@@ -45,6 +46,8 @@ object StandaloneModeLibraryBinaryTestConfigurator : StandaloneModeConfiguratorB
             useAdditionalService<KtModuleFactory> { KtCombinedModuleFactory() }
             useAdditionalService<TestModuleCompiler> { DispatchingTestModuleCompiler() }
             useAdditionalService<TestModuleDecompiler> { TestModuleDecompilerJar() }
+
+            this.defaultsProviderBuilder.dependencyKind = DependencyKind.Binary
         }
     }
 
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.kt
index 8ac1a64f5a1..298764c16bc 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.kt
@@ -17,8 +17,7 @@ package my.collections
 
 fun <K, V> myMapOf(vararg pairs: Pair<K, V>): Map<K, V> = mapOf(*pairs)
 
-// MODULE: app
-// DEPENDENCY: lib Binary
+// MODULE: app(lib)
 // FILE: main.kt
 
 import my.collections.*
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt
index 36280273a1c..8c4717c35f1 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt
@@ -16,8 +16,7 @@ class Dependency {
 
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
-// MODULE: app
-// DEPENDENCY: lib Binary
+// MODULE: app(lib)
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt
index bdb77180bf1..c75d42c7ffe 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt
@@ -16,8 +16,7 @@ class Dependency {
 
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
-// MODULE: app
-// DEPENDENCY: lib Binary
+// MODULE: app(lib)
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt
index 0803739afe6..216ac57b483 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt
@@ -16,8 +16,7 @@ class Dependency {
 
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
-// MODULE: app
-// DEPENDENCY: lib Binary
+// MODULE: app(lib)
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt
index a0c335a47bb..ef5a91abce6 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt
@@ -16,8 +16,7 @@ class Dependency {
 
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
-// MODULE: app
-// DEPENDENCY: lib Binary
+// MODULE: app(lib)
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt
index 6650b30151f..15b9bc0af1d 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt
@@ -16,8 +16,7 @@ class Dependency {
 
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
-// MODULE: app
-// DEPENDENCY: lib Binary
+// MODULE: app(lib)
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt
index 30700b20fea..5eed227291c 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt
@@ -16,8 +16,7 @@ class Dependency {
 
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
-// MODULE: app
-// DEPENDENCY: lib Binary
+// MODULE: app(lib)
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt
index 456161204dc..ef53cf36bd5 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt
@@ -10,8 +10,7 @@ object DependencyObject {
     var varFlag: Flag<*> = TODO()
 }
 
-// MODULE: app
-// DEPENDENCY: lib Binary
+// MODULE: app(lib)
 // FILE: main.kt
 
 package some