diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle
index a5fbefec7ba..891209eace3 100644
--- a/libraries/kotlin.test/js/build.gradle
+++ b/libraries/kotlin.test/js/build.gradle
@@ -59,10 +59,11 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
     duplicatesStrategy DuplicatesStrategy.FAIL
 
     from zipTree(libraryJarWithoutIr.archiveFile)
-
-    def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:generateKotlinTestKLib")
-    dependsOn(irKlib)
-    from fileTree("${irKlib.outputs.files.singleFile.path}/klib")
+    if (rootProject.includeStdlibJsIr) {
+        def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:generateKotlinTestKLib")
+        dependsOn(irKlib)
+        from fileTree("${irKlib.outputs.files.singleFile.path}/klib")
+    }
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
@@ -72,7 +73,7 @@ task sourcesJar(type: Jar, dependsOn: classes) {
 
 artifacts {
     runtime libraryJarWithoutIr
-    archives rootProject.includeStdlibJsIr ? libraryJarWithIr : libraryJarWithoutIr
+    archives libraryJarWithIr
     distLibrary libraryJarWithoutIr
     archives sourcesJar
     sources sourcesJar
diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle
index 1ab52650ea1..c5695da6647 100644
--- a/libraries/stdlib/js-v1/build.gradle
+++ b/libraries/stdlib/js-v1/build.gradle
@@ -317,10 +317,11 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
     duplicatesStrategy DuplicatesStrategy.FAIL
 
     from zipTree(libraryJarWithoutIr.archiveFile)
-
-    def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:generateFullRuntimeKLib")
-    dependsOn(irKlib)
-    from fileTree("${irKlib.outputs.files.singleFile.path}/klib")
+    if (rootProject.includeStdlibJsIr) {
+        def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:generateFullRuntimeKLib")
+        dependsOn(irKlib)
+        from fileTree("${irKlib.outputs.files.singleFile.path}/klib")
+    }
 }
 
 
@@ -370,7 +371,7 @@ task distSourcesJar(type: Jar) {
 
 artifacts {
     runtime libraryJarWithoutIr
-    archives rootProject.includeStdlibJsIr ? libraryJarWithIr : libraryJarWithoutIr
+    archives libraryJarWithIr
     archives sourcesJar
     sources sourcesJar
     distSources distSourcesJar