diff --git a/analysis/analysis-api-standalone/testData/sessionBuilder/resolveAgainstCommonKLibFromOtherModule/commonMain/commonSrc.kt b/analysis/analysis-api-standalone/testData/sessionBuilder/resolveAgainstCommonKLibFromOtherModule/commonMain/commonSrc.kt
new file mode 100644
index 00000000000..9e82371eb44
--- /dev/null
+++ b/analysis/analysis-api-standalone/testData/sessionBuilder/resolveAgainstCommonKLibFromOtherModule/commonMain/commonSrc.kt
@@ -0,0 +1,9 @@
+package common
+
+import some.example.Person
+
+fun greetEachOther(people: Collection<Person>) {
+    for (person in people) {
+        person.greet()
+    }
+}
\ No newline at end of file
diff --git a/analysis/analysis-api-standalone/testData/sessionBuilder/resolveAgainstCommonKLibFromOtherModule/jvmMain/jvmSrc.kt b/analysis/analysis-api-standalone/testData/sessionBuilder/resolveAgainstCommonKLibFromOtherModule/jvmMain/jvmSrc.kt
new file mode 100644
index 00000000000..6f99d728fdc
--- /dev/null
+++ b/analysis/analysis-api-standalone/testData/sessionBuilder/resolveAgainstCommonKLibFromOtherModule/jvmMain/jvmSrc.kt
@@ -0,0 +1,19 @@
+package jvmTest
+
+import common.greetEachOther
+import some.example.Person
+
+private class MyPerson(
+    name: String
+) : Person(name) {
+    override fun greet() = "Hi"
+}
+
+fun test() {
+    greetEachOther(
+        listOf(
+            Person("Alice"),
+            MyPerson("Bob"),
+        )
+    )
+}
\ No newline at end of file
diff --git a/analysis/analysis-api-standalone/testData/sessionBuilder/resolveAgainstCommonKLibFromOtherModule/klibSrc/Person.kt b/analysis/analysis-api-standalone/testData/sessionBuilder/resolveAgainstCommonKLibFromOtherModule/klibSrc/Person.kt
new file mode 100644
index 00000000000..fc718ff82c5
--- /dev/null
+++ b/analysis/analysis-api-standalone/testData/sessionBuilder/resolveAgainstCommonKLibFromOtherModule/klibSrc/Person.kt
@@ -0,0 +1,7 @@
+package some.example
+
+open class Person(
+    val name: String
+) {
+    open fun greet() = "Hello"
+}
\ No newline at end of file
diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/StandaloneSessionBuilderTest.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/StandaloneSessionBuilderTest.kt
index 9b73e9e157b..028aceddaf1 100644
--- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/StandaloneSessionBuilderTest.kt
+++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/StandaloneSessionBuilderTest.kt
@@ -25,12 +25,10 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.platform.CommonPlatforms
-import org.jetbrains.kotlin.platform.js.JsPlatforms
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.psiUtil.findDescendantOfType
-import org.jetbrains.kotlin.utils.PathUtil
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import java.nio.file.Paths
@@ -76,6 +74,7 @@ class StandaloneSessionBuilderTest : TestWithDisposable() {
 
     @Test
     fun testResolveAgainstCommonKlib() {
+        val root = "resolveAgainstCommonKLib"
         lateinit var sourceModule: KtSourceModule
         val session = buildStandaloneAnalysisAPISession(disposable) {
             registerProjectService(KtLifetimeTokenProvider::class.java, KtAlwaysAccessibleLifetimeTokenProvider())
@@ -84,7 +83,7 @@ class StandaloneSessionBuilderTest : TestWithDisposable() {
                 platform = CommonPlatforms.defaultCommonPlatform
                 val kLib = addModule(
                     buildKtLibraryModule {
-                        val compiledKLibRoot = compileCommonKlib(testDataPath("resolveAgainstCommonKLib/klibSrc"))
+                        val compiledKLibRoot = compileCommonKlib(testDataPath(root).resolve("klibSrc"))
                         addBinaryRoot(compiledKLibRoot)
                         platform = CommonPlatforms.defaultCommonPlatform
                         libraryName = "klib"
@@ -92,7 +91,7 @@ class StandaloneSessionBuilderTest : TestWithDisposable() {
                 )
                 sourceModule = addModule(
                     buildKtSourceModule {
-                        addSourceRoot(testDataPath("resolveAgainstCommonKLib/src"))
+                        addSourceRoot(testDataPath(root).resolve("src"))
                         addRegularDependency(kLib)
                         platform = CommonPlatforms.defaultCommonPlatform
                         moduleName = "source"
@@ -106,8 +105,56 @@ class StandaloneSessionBuilderTest : TestWithDisposable() {
         ktCallExpression.assertIsCallOf(CallableId(FqName("commonKLib"), Name.identifier("commonKLibFunction")))
     }
 
+    @Test
+    fun testResolveAgainstCommonKlibFromOtherModule() {
+        val root = "resolveAgainstCommonKLibFromOtherModule"
+        lateinit var commonModule: KtSourceModule
+        lateinit var sourceModule: KtSourceModule
+        val session = buildStandaloneAnalysisAPISession(disposable) {
+            registerProjectService(KtLifetimeTokenProvider::class.java, KtAlwaysAccessibleLifetimeTokenProvider())
+
+            buildKtModuleProvider {
+                platform = CommonPlatforms.defaultCommonPlatform
+                val kLib = addModule(
+                    buildKtLibraryModule {
+                        val compiledKLibRoot = compileCommonKlib(testDataPath(root).resolve("klibSrc"))
+                        addBinaryRoot(compiledKLibRoot)
+                        platform = CommonPlatforms.defaultCommonPlatform
+                        libraryName = "klib"
+                    }
+                )
+                commonModule = addModule(
+                    buildKtSourceModule {
+                        addSourceRoot(testDataPath(root).resolve("commonMain"))
+                        addRegularDependency(kLib)
+                        platform = CommonPlatforms.defaultCommonPlatform
+                        moduleName = "common"
+                    }
+                )
+                sourceModule = addModule(
+                    buildKtSourceModule {
+                        addSourceRoot(testDataPath(root).resolve("jvmMain"))
+                        addRegularDependency(kLib)
+                        addRegularDependency(commonModule)
+                        platform = JvmPlatforms.defaultJvmPlatform
+                        moduleName = "app"
+                    }
+                )
+            }
+        }
+
+        val ktFileInCommon = session.modulesWithFiles.getValue(commonModule).single() as KtFile
+        val callInCommon = ktFileInCommon.findDescendantOfType<KtCallExpression>()!!
+        callInCommon.assertIsCallOf(CallableId(FqName("some.example"), FqName("Person"), Name.identifier("greet")))
+
+        val ktFileInJvm = session.modulesWithFiles.getValue(sourceModule).single() as KtFile
+        val callInJvm = ktFileInJvm.findDescendantOfType<KtCallExpression>()!!
+        callInJvm.assertIsCallOf(CallableId(FqName("common"), Name.identifier("greetEachOther")))
+    }
+
     @Test
     fun testKotlinSourceModuleSessionBuilder() {
+        val root = "otherModuleUsage"
         lateinit var sourceModule: KtSourceModule
         val session = buildStandaloneAnalysisAPISession(disposable) {
             registerProjectService(KtLifetimeTokenProvider::class.java, KtAlwaysAccessibleLifetimeTokenProvider())
@@ -116,14 +163,14 @@ class StandaloneSessionBuilderTest : TestWithDisposable() {
                 platform = JvmPlatforms.defaultJvmPlatform
                 val main = addModule(
                     buildKtSourceModule {
-                        addSourceRoot(testDataPath("otherModuleUsage").resolve("dependent"))
+                        addSourceRoot(testDataPath(root).resolve("dependent"))
                         platform = JvmPlatforms.defaultJvmPlatform
                         moduleName = "dependent"
                     }
                 )
                 sourceModule = addModule(
                     buildKtSourceModule {
-                        addSourceRoot(testDataPath("otherModuleUsage").resolve("main"))
+                        addSourceRoot(testDataPath(root).resolve("main"))
                         addRegularDependency(main)
                         platform = JvmPlatforms.defaultJvmPlatform
                         moduleName = "main"