diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
index e338f35386c..741cf7469bf 100644
--- a/.idea/runConfigurations/All_Tests.xml
+++ b/.idea/runConfigurations/All_Tests.xml
@@ -19,7 +19,7 @@
     <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
+      <value defaultName="moduleWithDependencies" />
     </option>
     <envs />
     <patterns />
diff --git a/.idea/runConfigurations/All_Tests__Excluding_j2k_.xml b/.idea/runConfigurations/J2K_Tests.xml
similarity index 91%
rename from .idea/runConfigurations/All_Tests__Excluding_j2k_.xml
rename to .idea/runConfigurations/J2K_Tests.xml
index 66275c7d3ec..98bdd9fbe6b 100644
--- a/.idea/runConfigurations/All_Tests__Excluding_j2k_.xml
+++ b/.idea/runConfigurations/J2K_Tests.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All Tests (Excluding j2k)" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="J2K Tests" type="JUnit" factoryName="JUnit">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
       <pattern>
         <option name="PATTERN" value="org.jetbrains.jet.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
-    <module name="idea" />
+    <module name="j2k-tests" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" value="" />
     <option name="PACKAGE_NAME" value="org.jetbrains.jet" />