diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index b62b9701e4e..cebcefc5ca8 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -230,6 +230,9 @@ fun Test.setUpJsBoxTests(jsEnabled: Boolean, jsIrEnabled: Boolean) {
 
     exclude("org/jetbrains/kotlin/js/testOld/wasm/semantics/*")
 
+    if (jsEnabled && !jsIrEnabled) exclude("org/jetbrains/kotlin/js/test/ir/*")
+    if (!jsEnabled && jsIrEnabled) include("org/jetbrains/kotlin/js/test/ir/*")
+
     jvmArgs("-da:jdk.nashorn.internal.runtime.RecompilableScriptFunctionData") // Disable assertion which fails due to a bug in nashorn (KT-23637)
     setUpBoxTests()
 }
diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
index 7f7ecd50a0e..ec2043cdcdf 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.js.testOld.wasm.semantics.AbstractIrCodegenBoxWasmTe
 import org.jetbrains.kotlin.js.testOld.wasm.semantics.AbstractIrCodegenWasmJsInteropWasmTest
 import org.jetbrains.kotlin.js.testOld.wasm.semantics.AbstractJsTranslatorWasmTest
 import org.jetbrains.kotlin.js.test.*
-import org.jetbrains.kotlin.js.test.AbstractIrJsTypeScriptExportTest
+import org.jetbrains.kotlin.js.test.ir.*
 import org.jetbrains.kotlin.test.TargetBackend
 
 fun main(args: Array<String>) {
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsIrTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt
similarity index 97%
rename from js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsIrTest.kt
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt
index 7c5e3384626..d3a29ad8fa9 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsIrTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt
@@ -3,8 +3,9 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.js.test
+package org.jetbrains.kotlin.js.test.ir
 
+import org.jetbrains.kotlin.js.test.AbstractJsBlackBoxCodegenTestBase
 import org.jetbrains.kotlin.js.test.converters.JsIrBackendFacade
 import org.jetbrains.kotlin.js.test.converters.JsKlibBackendFacade
 import org.jetbrains.kotlin.js.test.converters.incremental.RecompileModuleJsIrBackendFacade
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrBoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java
similarity index 99%
rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrBoxJsTestGenerated.java
rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java
index 12fbfdb51a8..46003f15682 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrBoxJsTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.js.test;
+package org.jetbrains.kotlin.js.test.ir;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrCodegenWasmJsInteropJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrCodegenWasmJsInteropJsTestGenerated.java
similarity index 98%
rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrCodegenWasmJsInteropJsTestGenerated.java
rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrCodegenWasmJsInteropJsTestGenerated.java
index 70c986e6f11..4739e49a00d 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrCodegenWasmJsInteropJsTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrCodegenWasmJsInteropJsTestGenerated.java
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.js.test;
+package org.jetbrains.kotlin.js.test.ir;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxErrorTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxErrorTestGenerated.java
similarity index 99%
rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxErrorTestGenerated.java
rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxErrorTestGenerated.java
index 3e1078c95d7..99b0887fe84 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxErrorTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxErrorTestGenerated.java
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.js.test;
+package org.jetbrains.kotlin.js.test.ir;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
similarity index 99%
rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxTestGenerated.java
rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
index ca481be0121..04812fcd09f 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.js.test;
+package org.jetbrains.kotlin.js.test.ir;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenInlineTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenInlineTestGenerated.java
similarity index 99%
rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenInlineTestGenerated.java
rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenInlineTestGenerated.java
index 5f80883cde1..268b0b55d38 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenInlineTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenInlineTestGenerated.java
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.js.test;
+package org.jetbrains.kotlin.js.test.ir;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsTypeScriptExportTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsTypeScriptExportTestGenerated.java
similarity index 99%
rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsTypeScriptExportTestGenerated.java
rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsTypeScriptExportTestGenerated.java
index 5d779e0ff1e..5b26082397b 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsTypeScriptExportTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsTypeScriptExportTestGenerated.java
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.js.test;
+package org.jetbrains.kotlin.js.test.ir;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;