diff --git a/idea/testData/codeInsight/lineMarker/Class.kt b/idea/testData/codeInsight/lineMarker/Class.kt
index ffad6b67f74..5a55b08ccbb 100644
--- a/idea/testData/codeInsight/lineMarker/Class.kt
+++ b/idea/testData/codeInsight/lineMarker/Class.kt
@@ -1,9 +1,9 @@
-open class A {
+open class <lineMarker></lineMarker>A {
   open fun a(){
   }
 }
 
 class B:A(){
-  override fun a(){
+  override fun <lineMarker></lineMarker>a(){
   }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/Trait.kt b/idea/testData/codeInsight/lineMarker/Trait.kt
index a2ea96d8bab..61c1b6272a7 100644
--- a/idea/testData/codeInsight/lineMarker/Trait.kt
+++ b/idea/testData/codeInsight/lineMarker/Trait.kt
@@ -1,9 +1,9 @@
-trait A {
+trait <lineMarker></lineMarker>A {
   fun a(){
   }
 }
 
 class B :A {
-  override fun a(){
+  override fun <lineMarker></lineMarker>a(){
   }
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementLineMarkerTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementLineMarkerTest.java
index cbda076acc7..2b52ed5f21d 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementLineMarkerTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementLineMarkerTest.java
@@ -18,8 +18,10 @@ package org.jetbrains.jet.plugin.codeInsight;
 
 import com.intellij.codeInsight.daemon.LineMarkerInfo;
 import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl;
-import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.testFramework.ExpectedHighlightingData;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 
@@ -33,26 +35,31 @@ public class OverrideImplementLineMarkerTest extends LightCodeInsightFixtureTest
     }
 
     public void testTrait() throws Throwable {
-        doSimpleTest(2);
+        doTest();
     }
 
     public void testClass() throws Throwable {
-        doSimpleTest(2);
+        doTest();
     }
 
-    private void doSimpleTest(int count) throws Throwable {
-        myFixture.configureByFile(getTestName(false) + ".kt");
-        doTest(count);
-    }
+    private void doTest() {
+        try {
+            myFixture.configureByFile(getTestName(false) + ".kt");
+            Project project = myFixture.getProject();
+            Document document = myFixture.getEditor().getDocument();
 
-    private void doTest(int count) {
-        Editor editor = myFixture.getEditor();
-        Project project = myFixture.getProject();
+            ExpectedHighlightingData data = new ExpectedHighlightingData(document, false, false, false, myFixture.getFile());
+            data.init();
 
-        myFixture.doHighlighting();
+            PsiDocumentManager.getInstance(project).commitAllDocuments();
 
-        List<LineMarkerInfo> infoList = DaemonCodeAnalyzerImpl.getLineMarkers(editor.getDocument(), project);
-        assertNotNull(infoList);
-        assertEquals(count, infoList.size());
+            myFixture.doHighlighting();
+
+            List<LineMarkerInfo> markers = DaemonCodeAnalyzerImpl.getLineMarkers(document, project);
+            data.checkLineMarkers(markers, document.getText());
+        }
+        catch (Exception exc) {
+            throw new RuntimeException(exc);
+        }
     }
 }