diff --git a/compiler/container/container.iml b/compiler/container/container.iml
index 8362c8cbbd0..80678bd2e07 100644
--- a/compiler/container/container.iml
+++ b/compiler/container/container.iml
@@ -13,5 +13,6 @@
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" exported="" name="javax.inject" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
index edf8c6b6b1c..7575d3ca199 100644
--- a/compiler/frontend/frontend.iml
+++ b/compiler/frontend/frontend.iml
@@ -13,5 +13,6 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="plugin-api" exported="" />
     <orderEntry type="module" module-name="container" exported="" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index a61f976a227..9b30894e0d5 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -28,5 +28,6 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="daemon-client" />
     <orderEntry type="module" module-name="daemon-common" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
   </component>
-</module>
\ No newline at end of file
+</module>
diff --git a/generators/generators.iml b/generators/generators.iml
index 8c9bc99002a..39f9a341e79 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -31,5 +31,6 @@
     <orderEntry type="module" module-name="idea-completion" scope="TEST" />
     <orderEntry type="module" module-name="annotation-collector" scope="TEST" />
     <orderEntry type="module" module-name="container" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-completion/idea-completion.iml b/idea/idea-completion/idea-completion.iml
index ed529e31fdf..90ad5326766 100644
--- a/idea/idea-completion/idea-completion.iml
+++ b/idea/idea-completion/idea-completion.iml
@@ -23,5 +23,6 @@
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
     <orderEntry type="module" module-name="idea" scope="RUNTIME" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt
index dd9aeaa8749..b9e997e648c 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt
@@ -28,7 +28,6 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
 import org.jetbrains.kotlin.idea.completion.test.ExpectedCompletionUtils
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.test.KotlinTestUtils
-import kotlin.test.fail
 
 public abstract class CompletionHandlerTestBase() : KotlinLightCodeInsightFixtureTestCase() {
     protected val fixture: JavaCodeInsightTestFixture
diff --git a/idea/idea-test-framework/idea-test-framework.iml b/idea/idea-test-framework/idea-test-framework.iml
index f6f45360e40..0ec506050f3 100644
--- a/idea/idea-test-framework/idea-test-framework.iml
+++ b/idea/idea-test-framework/idea-test-framework.iml
@@ -13,5 +13,6 @@
     <orderEntry type="module" module-name="idea-analysis" />
     <orderEntry type="module" module-name="idea-core" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea.iml b/idea/idea.iml
index 4d9316bb8d5..8c98b4e91d6 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -51,5 +51,6 @@
     <orderEntry type="module" module-name="daemon-client" />
     <orderEntry type="module" module-name="idea-repl" scope="TEST" />
     <orderEntry type="module" module-name="idea-live-templates" exported="" scope="RUNTIME" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
index 7e51764c54e..69920e17ed0 100644
--- a/jps-plugin/jps-plugin.iml
+++ b/jps-plugin/jps-plugin.iml
@@ -22,5 +22,6 @@
     <orderEntry type="module" module-name="preloader" />
     <orderEntry type="module" module-name="daemon-client" />
     <orderEntry type="module" module-name="daemon-common" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
   </component>
-</module>
\ No newline at end of file
+</module>