diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
index 597c04cf891..f9f40951b8a 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.jps.build
 
 import com.intellij.openapi.util.io.FileUtil
+import org.jetbrains.kotlin.incremental.components.LookupInfo
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.incremental.components.Position
 import org.jetbrains.kotlin.incremental.components.ScopeKind
@@ -37,7 +38,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest(
     override fun checkLookups(lookupTracker: LookupTracker, compiledFiles: Set<File>) {
         if (lookupTracker !is TestLookupTracker) throw AssertionError("Expected TestLookupTracker, but: ${lookupTracker.javaClass}")
 
-        val fileToLookups = lookupTracker.lookups.groupBy { it.lookupContainingFile }
+        val fileToLookups = lookupTracker.lookups.groupBy { it.filePath }
 
         fun checkLookupsInFile(expectedFile: File, actualFile: File) {
 
@@ -53,8 +54,8 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest(
 
             val lines = text.lines().toArrayList()
 
-            for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.lookupLine }) {
-                val columnToLookups = lookupsFromLine.groupBy { it.lookupColumn }.toList().sortedBy { it.first }
+            for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.position.line }) {
+                val columnToLookups = lookupsFromLine.groupBy { it.position.column }.toList().sortedBy { it.first }
 
                 val lineContent = lines[line - 1]
                 val parts = ArrayList<CharSequence>(columnToLookups.size * 2)
@@ -123,18 +124,8 @@ class TestLookupTracker : LookupTracker {
         get() = true
 
     override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
-        val (line, column) = position
-        lookups.add(LookupInfo(filePath, line, column, scopeFqName, scopeKind, name))
+        lookups.add(LookupInfo(filePath, position, scopeFqName, scopeKind, name))
     }
-
-    data class LookupInfo(
-            val lookupContainingFile: String,
-            val lookupLine: Int,
-            val lookupColumn: Int,
-            val scopeFqName: String,
-            val scopeKind: ScopeKind,
-            val name: String
-    )
 }