diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index f72680d37aad..24501207c929 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -35,7 +35,7 @@
       <module name="annotations-common" target="1.5" />
       <module name="annotations-java8" target="1.8" />
       <module name="community-tests" target="1.8" />
-      <module name="configuration-store-tests" target="1.8" />
+      <module name="diff-tests" target="1.8" />
       <module name="gradle-jps-plugin" target="1.6" />
       <module name="groovy-rt-constants" target="1.5" />
       <module name="groovy_rt" target="1.5" />
@@ -53,9 +53,10 @@
       <module name="jps-standalone-builder" target="1.6" />
       <module name="json-tests" target="1.8" />
       <module name="junit_rt" target="1.3" />
+      <module name="lang-tests" target="1.8" />
       <module name="maven-jps-plugin" target="1.6" />
+      <module name="platform-tests" target="1.8" />
       <module name="remote-servers-agent-rt" target="1.5" />
-      <module name="settings-repository-tests" target="1.8" />
       <module name="svn4idea-tests" target="1.8" />
       <module name="tasks-tests" target="1.8" />
       <module name="testng_rt" target="1.5" />
diff --git a/platform/diff-impl/diff-tests.iml b/platform/diff-impl/diff-tests.iml
index eca0e5bb0215..b85fb62c1d37 100644
--- a/platform/diff-impl/diff-tests.iml
+++ b/platform/diff-impl/diff-tests.iml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/tests">
       <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="core-api" />
     <orderEntry type="module" module-name="diff-api" exported="" />
diff --git a/platform/lang-impl/lang-tests.iml b/platform/lang-impl/lang-tests.iml
index 34556a95af19..da60f23779ec 100644
--- a/platform/lang-impl/lang-tests.iml
+++ b/platform/lang-impl/lang-tests.iml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/testSources">
       <sourceFolder url="file://$MODULE_DIR$/testSources" isTestSource="true" />
     </content>
     <orderEntry type="module" module-name="boot" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="lang-api" exported="" />
     <orderEntry type="module" module-name="vcs-api" />
diff --git a/platform/platform-tests/platform-tests.iml b/platform/platform-tests/platform-tests.iml
index a4715f44c10a..f86f03c172f9 100644
--- a/platform/platform-tests/platform-tests.iml
+++ b/platform/platform-tests/platform-tests.iml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />