diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotation/common/common.kt b/idea/testData/multiModuleLineMarker/fromActualAnnotation/common/common.kt
new file mode 100644
index 00000000000..2f4a054b284
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualAnnotation/common/common.kt
@@ -0,0 +1,6 @@
+// !CHECK_HIGHLIGHTING
+
+expect annotation class Ann(
+        val x: Int,
+        val y: String
+)
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
new file mode 100644
index 00000000000..9f1316f2e06
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
@@ -0,0 +1,4 @@
+actual annotation class <lineMarker>Ann</lineMarker> actual <lineMarker>constructor</lineMarker>(
+        actual val <lineMarker>x</lineMarker>: Int,
+        actual val <lineMarker>y</lineMarker>: String
+)
diff --git a/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/common/common.kt b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/common/common.kt
new file mode 100644
index 00000000000..f1576710823
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/common/common.kt
@@ -0,0 +1,5 @@
+// !CHECK_HIGHLIGHTING
+
+expect class NoConstructor2 {
+    fun extraFun()
+}
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt
new file mode 100644
index 00000000000..604846fad0f
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt
@@ -0,0 +1,5 @@
+actual class <lineMarker>NoConstructor2</lineMarker>(name: String) {
+    val myName = name
+    actual fun <lineMarker>extraFun</lineMarker>() {}
+}
+
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
new file mode 100644
index 00000000000..16dce8a4398
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
@@ -0,0 +1,4 @@
+expect annotation class <lineMarker>Ann</lineMarker> <lineMarker>constructor</lineMarker>(
+        val <lineMarker>x</lineMarker>: Int,
+        val <lineMarker>y</lineMarker>: String
+)
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/jvm/jvm.kt
new file mode 100644
index 00000000000..8bab064bca3
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/jvm/jvm.kt
@@ -0,0 +1,6 @@
+// !CHECK_HIGHLIGHTING
+
+actual annotation class Ann actual constructor(
+        actual val x: Int,
+        actual val y: String
+)
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt
new file mode 100644
index 00000000000..d5eeccb138e
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt
@@ -0,0 +1,3 @@
+expect class <lineMarker>NoConstructor2</lineMarker> {
+    fun <lineMarker>extraFun</lineMarker>()
+}
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/jvm/jvm.kt
new file mode 100644
index 00000000000..e46070ab465
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/jvm/jvm.kt
@@ -0,0 +1,7 @@
+// !CHECK_HIGHLIGHTING
+
+actual class NoConstructor2(name: String) {
+    val myName = name
+    actual fun extraFun() {}
+}
+
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt
index 17e2fcba10d..ce50ba2aa7b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt
@@ -34,6 +34,14 @@ class MultiModuleLineMarkerTest : AbstractMultiModuleHighlightingTest() {
 
     override fun doTestLineMarkers() = true
 
+    fun testFromActualAnnotation() {
+        doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
+    }
+
+    fun testFromActualPrimaryConstructor() {
+        doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
+    }
+
     fun testFromActualSealedClass() {
         doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
     }
@@ -54,6 +62,14 @@ class MultiModuleLineMarkerTest : AbstractMultiModuleHighlightingTest() {
         doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
     }
 
+    fun testFromExpectedAnnotation() {
+        doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
+    }
+
+    fun testFromExpectedPrimaryConstructor() {
+        doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
+    }
+
     fun testFromExpectedSealedClass() {
         doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
     }