diff --git a/.idea/modules.xml b/.idea/modules.xml
index 80d186d81dd..8f22a434b66 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -27,7 +27,6 @@
       <module fileurl="file://$PROJECT_DIR$/injector-generator/injector-generator.iml" filepath="$PROJECT_DIR$/injector-generator/injector-generator.iml" group="infrastructure" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />
-      <module fileurl="file://$PROJECT_DIR$/j2k/tests/j2k-tests.iml" filepath="$PROJECT_DIR$/j2k/tests/j2k-tests.iml" group="j2k" />
       <module fileurl="file://$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" filepath="$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-plugin.iml" group="ide/jps" />
       <module fileurl="file://$PROJECT_DIR$/js/js.dart-ast/js.dart-ast.iml" filepath="$PROJECT_DIR$/js/js.dart-ast/js.dart-ast.iml" group="compiler/js" />
diff --git a/generators/generators.iml b/generators/generators.iml
index 56a2afe8b3b..53b7a9b233a 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -21,8 +21,8 @@
     <orderEntry type="module" module-name="js.tests" scope="TEST" />
     <orderEntry type="module" module-name="jps-plugin" scope="TEST" />
     <orderEntry type="module" module-name="util" scope="TEST" />
+    <orderEntry type="module" module-name="j2k" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="j2k-tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
   </component>
 </module>
diff --git a/j2k/j2k.iml b/j2k/j2k.iml
index 2eb792263d9..1d0afeb69cf 100644
--- a/j2k/j2k.iml
+++ b/j2k/j2k.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -13,6 +14,8 @@
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="jet.as.java.psi" />
+    <orderEntry type="module" module-name="idea" scope="TEST" />
+    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
   </component>
 </module>
 
diff --git a/j2k/tests/j2k-tests.iml b/j2k/tests/j2k-tests.iml
deleted file mode 100644
index d684b61ed71..00000000000
--- a/j2k/tests/j2k-tests.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="j2k" />
-    <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="frontend" scope="TEST" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
-    <orderEntry type="module" module-name="idea" scope="TEST" />
-  </component>
-</module>
-