diff --git a/.idea/runConfigurations/Java_8_Tests.xml b/.idea/runConfigurations/Java_8_Tests.xml
index 700f6ca24d6..fe2a0374141 100644
--- a/.idea/runConfigurations/Java_8_Tests.xml
+++ b/.idea/runConfigurations/Java_8_Tests.xml
@@ -7,7 +7,7 @@
       </pattern>
     </extension>
     <module name="java8-tests" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
     <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
     <option name="MAIN_CLASS_NAME" value="" />
diff --git a/compiler/java8-tests/java8-tests.iml b/compiler/java8-tests/java8-tests.iml
index a9e0d74928b..61f1aac3c9b 100644
--- a/compiler/java8-tests/java8-tests.iml
+++ b/compiler/java8-tests/java8-tests.iml
@@ -6,7 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
diff --git a/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenJava8Test.java b/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenJava8Test.java
index 3b24dd1ef07..bab71d1e6bb 100644
--- a/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenJava8Test.java
+++ b/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenJava8Test.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.codegen.generated;
 
-import org.jetbrains.annotations.NotNull;
 
 public abstract class AbstractBlackBoxCodegenJava8Test extends AbstractBlackBoxCodegenTest {