diff --git a/.gitignore b/.gitignore
index 418c4b25977..dc00837667b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,5 +51,5 @@ build/
 kotlin-ultimate/
 node_modules/
 .rpt2_cache/
-libraries/tools/kotlin-test-nodejs-runner/lib/
+libraries/tools/kotlin-test-js-runner/lib/
 local.properties
diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
index 3d7f5a78d7c..5c3548380f4 100644
--- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
@@ -51,8 +51,8 @@ class CodeConformanceTest : TestCase() {
             "libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build/tmp",
             "libraries/tools/kotlin-maven-plugin/target",
             "libraries/tools/kotlinp/src",
-            "libraries/tools/kotlin-test-nodejs-runner/node_modules",
-            "libraries/tools/kotlin-test-nodejs-runner/.gradle",
+            "libraries/tools/kotlin-test-js-runner/node_modules",
+            "libraries/tools/kotlin-test-js-runner/.gradle",
             "compiler/testData/psi/kdoc",
             "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt",
             "compiler/util/src/org/jetbrains/kotlin/config/MavenComparableVersion.java",
@@ -81,8 +81,8 @@ class CodeConformanceTest : TestCase() {
             "libraries/stdlib/js-v1/node_modules",
             "libraries/tools/kotlin-maven-plugin-test/target",
             "libraries/tools/kotlin-gradle-plugin-integration-tests/build",
-            "libraries/tools/kotlin-test-nodejs-runner/node_modules",
-            "libraries/tools/kotlin-test-nodejs-runner/.gradle",
+            "libraries/tools/kotlin-test-js-runner/node_modules",
+            "libraries/tools/kotlin-test-js-runner/.gradle",
             "buildSrc/prepare-deps/build",
             "compiler/ir/serialization.js/build"
         )
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
index 409493d7e5f..9ce9168fabc 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -111,7 +111,7 @@ tasks.withType<Test> {
         ":kotlin-scripting-common:install",
         ":kotlin-scripting-jvm:install",
         ":kotlin-scripting-compiler-embeddable:install",
-        ":kotlin-test-nodejs-runner:install"
+        ":kotlin-test-js-runner:install"
     )
 
     executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
index eb2d2461f46..d5ac4649f19 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
@@ -384,10 +384,10 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
             assertFileExists("build/js/node_modules/kotlin/kotlin.js.map")
             assertFileExists("build/js/node_modules/kotlin-test/kotlin-test.js")
             assertFileExists("build/js/node_modules/kotlin-test/kotlin-test.js.map")
-            assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-test-nodejs-runner.js")
-            assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-test-nodejs-runner.js.map")
-            assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js")
-            assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js.map")
+            assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-test-nodejs-runner.js")
+            assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-test-nodejs-runner.js.map")
+            assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-nodejs-source-map-support.js")
+            assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-nodejs-source-map-support.js.map")
             assertFileExists("build/js/node_modules/kotlin-js-plugin/kotlin/kotlin-js-plugin.js")
             assertFileExists("build/js/node_modules/kotlin-js-plugin/kotlin/kotlin-js-plugin.js.map")
             assertFileExists("build/js/node_modules/kotlin-js-plugin-test/kotlin/kotlin-js-plugin-test.js")
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt
index a384c753c5a..7f9b8b374de 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt
@@ -47,7 +47,7 @@ class NpmVersions {
 
     val puppeteer = NpmPackageVersion("puppeteer", "1.19.0")
 
-    val kotlinNodeJsTestRunner = KotlinGradleNpmPackage("test-nodejs-runner")
+    val kotlinNodeJsTestRunner = KotlinGradleNpmPackage("test-js-runner")
 
     val istanbulInstrumenterLoader = NpmPackageVersion("istanbul-instrumenter-loader", "3.0.1")
 }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
index 33fcfd8d5a7..253cad66edc 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
@@ -41,7 +41,7 @@ open class NodeJsExec : AbstractExecTask<NodeJsExec>(NodeJsExec::class.java), Re
         if (sourceMapStackTraces) {
             args(
                 "--require",
-                compilation.npmProject.require("kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support")
+                compilation.npmProject.require("kotlin-test-js-runner/kotlin-nodejs-source-map-support")
             )
         }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
index 3f309b22077..ff6fbc48413 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
@@ -335,7 +335,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
 
             val adapterJs = npmProject.dir.resolve("adapter.js")
             adapterJs.printWriter().use { writer ->
-                val karmaRunner = npmProject.require("kotlin-test-nodejs-runner/kotlin-test-karma-runner.js")
+                val karmaRunner = npmProject.require("kotlin-test-js-runner/kotlin-test-karma-runner.js")
                 writer.println("require('$karmaRunner')")
 
                 files.forEach { file ->
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt
index 286c3a14a3e..073e4b122c6 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt
@@ -28,7 +28,7 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF
 
     override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency>
         get() = listOf(
-            KotlinGradleNpmPackage("test-nodejs-runner"),
+            KotlinGradleNpmPackage("test-js-runner"),
             versions.mocha,
             versions.mochaTeamCityReporter
         )
@@ -58,7 +58,7 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF
                     npmProject.require(it)
                 } +
                 listOf(
-                    "-r", "kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js",
+                    "-r", "kotlin-test-js-runner/kotlin-nodejs-source-map-support.js",
                     "--reporter", "mocha-teamcity-reporter"
                 )
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunner.kt
index fb690be454f..1e1b956233a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunner.kt
@@ -29,7 +29,7 @@ class KotlinNodeJsTestRunner(override val compilation: KotlinJsCompilation) : Ko
         get() = "KotlinNodeJsTestRunner(ignoredTestSuites=$ignoredTestSuites)"
 
     override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency>
-        get() = listOf(KotlinGradleNpmPackage("test-nodejs-runner"))
+        get() = listOf(KotlinGradleNpmPackage("test-js-runner"))
 
     override fun createTestExecutionSpec(
         task: KotlinJsTest,
@@ -53,8 +53,8 @@ class KotlinNodeJsTestRunner(override val compilation: KotlinJsCompilation) : Ko
         )
 
         val testRuntimeNodeModules = listOf(
-            "kotlin-test-nodejs-runner/kotlin-test-nodejs-runner.js",
-            "kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js"
+            "kotlin-test-js-runner/kotlin-test-nodejs-runner.js",
+            "kotlin-test-js-runner/kotlin-nodejs-source-map-support.js"
         )
 
         val args = nodeJsArgs +
diff --git a/libraries/tools/kotlin-test-nodejs-runner/.yarnclean b/libraries/tools/kotlin-test-js-runner/.yarnclean
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/.yarnclean
rename to libraries/tools/kotlin-test-js-runner/.yarnclean
diff --git a/libraries/tools/kotlin-test-nodejs-runner/README.md b/libraries/tools/kotlin-test-js-runner/README.md
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/README.md
rename to libraries/tools/kotlin-test-js-runner/README.md
diff --git a/libraries/tools/kotlin-test-nodejs-runner/build.gradle.kts b/libraries/tools/kotlin-test-js-runner/build.gradle.kts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/build.gradle.kts
rename to libraries/tools/kotlin-test-js-runner/build.gradle.kts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/env.ts b/libraries/tools/kotlin-test-js-runner/env.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/env.ts
rename to libraries/tools/kotlin-test-js-runner/env.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/karma.ts b/libraries/tools/kotlin-test-js-runner/karma.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/karma.ts
rename to libraries/tools/kotlin-test-js-runner/karma.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/nodejs-source-map-support.js b/libraries/tools/kotlin-test-js-runner/nodejs-source-map-support.js
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/nodejs-source-map-support.js
rename to libraries/tools/kotlin-test-js-runner/nodejs-source-map-support.js
diff --git a/libraries/tools/kotlin-test-nodejs-runner/nodejs.ts b/libraries/tools/kotlin-test-js-runner/nodejs.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/nodejs.ts
rename to libraries/tools/kotlin-test-js-runner/nodejs.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/package.json b/libraries/tools/kotlin-test-js-runner/package.json
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/package.json
rename to libraries/tools/kotlin-test-js-runner/package.json
diff --git a/libraries/tools/kotlin-test-nodejs-runner/rollup.config.js b/libraries/tools/kotlin-test-js-runner/rollup.config.js
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/rollup.config.js
rename to libraries/tools/kotlin-test-js-runner/rollup.config.js
diff --git a/libraries/tools/kotlin-test-nodejs-runner/src/Adapter.ts b/libraries/tools/kotlin-test-js-runner/src/Adapter.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/src/Adapter.ts
rename to libraries/tools/kotlin-test-js-runner/src/Adapter.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/src/CliArgsParser.ts b/libraries/tools/kotlin-test-js-runner/src/CliArgsParser.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/src/CliArgsParser.ts
rename to libraries/tools/kotlin-test-js-runner/src/CliArgsParser.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/src/CliFiltertingConfiguration.ts b/libraries/tools/kotlin-test-js-runner/src/CliFiltertingConfiguration.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/src/CliFiltertingConfiguration.ts
rename to libraries/tools/kotlin-test-js-runner/src/CliFiltertingConfiguration.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/src/KotlinTestRunner.ts b/libraries/tools/kotlin-test-js-runner/src/KotlinTestRunner.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/src/KotlinTestRunner.ts
rename to libraries/tools/kotlin-test-js-runner/src/KotlinTestRunner.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/src/KotlinTestTeamCityReporter.ts b/libraries/tools/kotlin-test-js-runner/src/KotlinTestTeamCityReporter.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/src/KotlinTestTeamCityReporter.ts
rename to libraries/tools/kotlin-test-js-runner/src/KotlinTestTeamCityReporter.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/src/KotlinTestsFilter.ts b/libraries/tools/kotlin-test-js-runner/src/KotlinTestsFilter.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/src/KotlinTestsFilter.ts
rename to libraries/tools/kotlin-test-js-runner/src/KotlinTestsFilter.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/src/KotlinTestsFilterDebug.ts b/libraries/tools/kotlin-test-js-runner/src/KotlinTestsFilterDebug.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/src/KotlinTestsFilterDebug.ts
rename to libraries/tools/kotlin-test-js-runner/src/KotlinTestsFilterDebug.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/src/TeamCityMessagesFlow.ts b/libraries/tools/kotlin-test-js-runner/src/TeamCityMessagesFlow.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/src/TeamCityMessagesFlow.ts
rename to libraries/tools/kotlin-test-js-runner/src/TeamCityMessagesFlow.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/src/Timer.ts b/libraries/tools/kotlin-test-js-runner/src/Timer.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/src/Timer.ts
rename to libraries/tools/kotlin-test-js-runner/src/Timer.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/src/utils.ts b/libraries/tools/kotlin-test-js-runner/src/utils.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/src/utils.ts
rename to libraries/tools/kotlin-test-js-runner/src/utils.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/tsconfig.json b/libraries/tools/kotlin-test-js-runner/tsconfig.json
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/tsconfig.json
rename to libraries/tools/kotlin-test-js-runner/tsconfig.json
diff --git a/libraries/tools/kotlin-test-nodejs-runner/window.d.ts b/libraries/tools/kotlin-test-js-runner/window.d.ts
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/window.d.ts
rename to libraries/tools/kotlin-test-js-runner/window.d.ts
diff --git a/libraries/tools/kotlin-test-nodejs-runner/yarn.lock b/libraries/tools/kotlin-test-js-runner/yarn.lock
similarity index 100%
rename from libraries/tools/kotlin-test-nodejs-runner/yarn.lock
rename to libraries/tools/kotlin-test-js-runner/yarn.lock
diff --git a/settings.gradle b/settings.gradle
index 98768c00906..7b846a99455 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -147,7 +147,7 @@ include ":kotlin-build-common",
         ":kotlin-test:kotlin-test-testng",
         ":kotlin-test:kotlin-test-js",
         ":kotlin-test:kotlin-test-js:kotlin-test-js-it",
-        ":kotlin-test-nodejs-runner",
+        ":kotlin-test-js-runner",
         ":kotlinx-metadata",
         ":kotlinx-metadata-jvm",
         ":prepare:build.version",
@@ -304,7 +304,7 @@ project(':kotlin-test:kotlin-test-junit5').projectDir = "$rootDir/libraries/kotl
 project(':kotlin-test:kotlin-test-testng').projectDir = "$rootDir/libraries/kotlin.test/testng" as File
 project(':kotlin-test:kotlin-test-js').projectDir = "$rootDir/libraries/kotlin.test/js" as File
 project(':kotlin-test:kotlin-test-js:kotlin-test-js-it').projectDir = "$rootDir/libraries/kotlin.test/js/it" as File
-project(':kotlin-test-nodejs-runner').projectDir = "$rootDir/libraries/tools/kotlin-test-nodejs-runner" as File
+project(':kotlin-test-js-runner').projectDir = "$rootDir/libraries/tools/kotlin-test-js-runner" as File
 project(':kotlin-reflect').projectDir = "$rootDir/libraries/reflect" as File
 project(':kotlin-reflect-api').projectDir = "$rootDir/libraries/reflect/api" as File
 project(':kotlinx-metadata').projectDir = "$rootDir/libraries/kotlinx-metadata" as File