diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationMultifileTest.java b/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationMultifileTest.java
index 8c8ae7c00e7..fcaf109a672 100644
--- a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationMultifileTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationMultifileTest.java
@@ -40,8 +40,8 @@ public class JetGotoImplementationMultifileTest extends CodeInsightTestCase {
 
     private void doMultifileTest(String ... fileNames) throws Exception {
         configureByFiles(null, fileNames);
-        GotoTargetHandler.GotoData gotoData = ImplementationTestUtils.invokeGotoImplementations(getEditor(), getFile());
-        ImplementationTestUtils.assertGotoImplementations(getEditor(), gotoData);
+        GotoTargetHandler.GotoData gotoData = NavigationTestUtils.invokeGotoImplementations(getEditor(), getFile());
+        NavigationTestUtils.assertGotoImplementations(getEditor(), gotoData);
     }
 
     @Override
diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationTest.java b/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationTest.java
index 790351e1b04..c07b5646f6f 100644
--- a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationTest.java
@@ -48,7 +48,7 @@ public class JetGotoImplementationTest extends LightCodeInsightTestCase {
 
     protected void doTest() {
         configureByFile(getTestName(false) + ".kt");
-        GotoTargetHandler.GotoData gotoData = ImplementationTestUtils.invokeGotoImplementations(getEditor(), getFile());
-        ImplementationTestUtils.assertGotoImplementations(getEditor(), gotoData);
+        GotoTargetHandler.GotoData gotoData = NavigationTestUtils.invokeGotoImplementations(getEditor(), getFile());
+        NavigationTestUtils.assertGotoImplementations(getEditor(), gotoData);
     }
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSymbolTest.java b/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSymbolTest.java
index 33d2c58ac85..1d2c7b7c808 100644
--- a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSymbolTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSymbolTest.java
@@ -48,6 +48,6 @@ public class JetGotoSymbolTest extends LightCodeInsightFixtureTestCase {
         String fileName = getTestName(true) + ".kt";
         myFixture.configureByFile(fileName);
 
-        ImplementationTestUtils.assertGotoSymbol(getProject(), myFixture.getEditor());
+        NavigationTestUtils.assertGotoSymbol(getProject(), myFixture.getEditor());
     }
 }