diff --git a/compiler/tests/org/jetbrains/kotlin/code/ModulesDependenciesTest.kt b/compiler/tests/org/jetbrains/kotlin/code/ModulesDependenciesTest.kt
index d14a7b28d40..aa51b6277f2 100644
--- a/compiler/tests/org/jetbrains/kotlin/code/ModulesDependenciesTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/code/ModulesDependenciesTest.kt
@@ -59,8 +59,8 @@ class ModulesDependenciesTest : TestCase() {
                             badModulesList.isEmpty())
     }
 
-    fun testNoBadReferencesInNonCompilerTests() {
-        val FORBIDDEN_MODULE_NAMES = MODULES_CAN_DEPEND_ON_COMPILER_TESTS.map { it.nameWithoutExtension }
+    fun testNoModulesFromOtherTestConfigurationsInNonCompilerTests() {
+        val FORBIDDEN_MODULE_NAMES = listOf(COMPILER_TESTS_JAVA8_MODULE_FILE, COMPILER_TESTS_MODULE_FILE).map { it.nameWithoutExtension }
 
         val moduleText = NON_COMPILER_TESTS_MODULE_FILE.readText()
         val nonCompilerTestsHasForbiddenDependencies = FORBIDDEN_MODULE_NAMES.none { moduleText.contains(it) }
diff --git a/non-compiler-tests/non-compiler-tests.iml b/non-compiler-tests/non-compiler-tests.iml
index a24201f0265..267c8cf0da5 100644
--- a/non-compiler-tests/non-compiler-tests.iml
+++ b/non-compiler-tests/non-compiler-tests.iml
@@ -33,5 +33,6 @@
     <orderEntry type="module" module-name="plugins-tests" scope="TEST" />
     <orderEntry type="module" module-name="idea-android" scope="TEST" />
     <orderEntry type="module" module-name="uast-kotlin" scope="TEST" />
+    <orderEntry type="module" module-name="generators" />
   </component>
 </module>
\ No newline at end of file