diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
index bc17423529a..6c7dfd966f1 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
@@ -194,9 +194,9 @@ class JsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigu
             return files.any { JsEnvironmentConfigurationDirectives.RECOMPILE in it.directives }
         }
 
-        fun incrementalEnabledFor(module: TestModule, testServices: TestServices): Boolean {
+        fun incrementalEnabled(testServices: TestServices): Boolean {
             return JsEnvironmentConfigurationDirectives.SKIP_IR_INCREMENTAL_CHECKS !in testServices.moduleStructure.allDirectives &&
-                    module.hasFilesToRecompile()
+                    testServices.moduleStructure.modules.any { it.hasFilesToRecompile() }
         }
     }
 
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt
index 7346169bcf3..b200e4e6957 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt
@@ -88,7 +88,7 @@ class JsIrBackendFacade(
 
         if (skipRegularMode) return null
 
-        if (JsEnvironmentConfigurator.incrementalEnabledFor(module, testServices)) {
+        if (JsEnvironmentConfigurator.incrementalEnabled(testServices)) {
             val outputFile = if (firstTimeCompilation) {
                 File(JsEnvironmentConfigurator.getJsModuleArtifactPath(testServices, module.name) + ".js")
             } else {
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt
index 6d2bc83f4b9..68f99ea8f6c 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt
@@ -90,7 +90,7 @@ class JsKlibBackendFacade(
         moduleDescriptor.setDependencies(dependencies + moduleDescriptor)
         testServices.moduleDescriptorProvider.replaceModuleDescriptorForModule(module, moduleDescriptor)
 
-        if (JsEnvironmentConfigurator.incrementalEnabledFor(module, testServices)) {
+        if (JsEnvironmentConfigurator.incrementalEnabled(testServices)) {
             testServices.jsIrIncrementalDataProvider.recordIncrementalData(module, lib)
         }
         testServices.jsLibraryProvider.setDescriptorAndLibraryByName(outputFile, moduleDescriptor, lib)
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/CommonRecompileModuleJsBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/CommonRecompileModuleJsBackendFacade.kt
index 5b7abe22831..988d26b629a 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/CommonRecompileModuleJsBackendFacade.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/CommonRecompileModuleJsBackendFacade.kt
@@ -78,6 +78,6 @@ abstract class CommonRecompileModuleJsBackendFacade<R : ResultingArtifact.Fronte
     }
 
     override fun shouldRunAnalysis(module: TestModule): Boolean {
-        return module.targetBackend == backendKind && JsEnvironmentConfigurator.incrementalEnabledFor(module, testServices)
+        return module.targetBackend == backendKind && JsEnvironmentConfigurator.run { incrementalEnabled(testServices) && module.hasFilesToRecompile()}
     }
 }
diff --git a/js/js.translator/testData/box/incremental/inlineModuleVariable.kt b/js/js.translator/testData/box/incremental/inlineModuleVariable.kt
index 9f725e511c8..3ab837070ff 100644
--- a/js/js.translator/testData/box/incremental/inlineModuleVariable.kt
+++ b/js/js.translator/testData/box/incremental/inlineModuleVariable.kt
@@ -1,4 +1,3 @@
-// SKIP_IR_INCREMENTAL_CHECKS
 // EXPECTED_REACHABLE_NODES: 1282
 // MODULE: lib
 // FILE: lib.kt
diff --git a/js/js.translator/testData/box/incremental/multipleReimport.kt b/js/js.translator/testData/box/incremental/multipleReimport.kt
index 1bd4f7c36f0..a877e47092c 100644
--- a/js/js.translator/testData/box/incremental/multipleReimport.kt
+++ b/js/js.translator/testData/box/incremental/multipleReimport.kt
@@ -1,4 +1,3 @@
-// SKIP_IR_INCREMENTAL_CHECKS
 // EXPECTED_REACHABLE_NODES: 1286
 // MODULE: lib1
 // FILE: lib1.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/inlineableAliasForExternalDeclaration.kt b/js/js.translator/testData/box/inlineMultiModule/inlineableAliasForExternalDeclaration.kt
index ff74ec7770b..7cdf142acd7 100644
--- a/js/js.translator/testData/box/inlineMultiModule/inlineableAliasForExternalDeclaration.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/inlineableAliasForExternalDeclaration.kt
@@ -1,4 +1,3 @@
-// SKIP_IR_INCREMENTAL_CHECKS
 // EXPECTED_REACHABLE_NODES: 1282
 // MODULE: lib
 // FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/repeatedImport.kt b/js/js.translator/testData/box/inlineMultiModule/repeatedImport.kt
index 1060aaadd51..cc0f5bd4df8 100644
--- a/js/js.translator/testData/box/inlineMultiModule/repeatedImport.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/repeatedImport.kt
@@ -1,4 +1,3 @@
-// SKIP_IR_INCREMENTAL_CHECKS
 // EXPECTED_REACHABLE_NODES: 1284
 // MODULE: lib
 // FILE: lib.kt