diff --git a/.idea/modules.xml b/.idea/modules.xml
index 857fb6b258c9..130d89734e62 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -18,7 +18,6 @@
       <module fileurl="file://$PROJECT_DIR$/fleet/codecache/test/fleet.codecache.test.iml" filepath="$PROJECT_DIR$/fleet/codecache/test/fleet.codecache.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/fleet/compiler-plugins/fleet.compiler.plugins.iml" filepath="$PROJECT_DIR$/fleet/compiler-plugins/fleet.compiler.plugins.iml" />
       <module fileurl="file://$PROJECT_DIR$/fleet/fastutil/fleet.fastutil.iml" filepath="$PROJECT_DIR$/fleet/fastutil/fleet.fastutil.iml" />
-      <module fileurl="file://$PROJECT_DIR$/fleet/junit/fleet.junit.iml" filepath="$PROJECT_DIR$/fleet/junit/fleet.junit.iml" />
       <module fileurl="file://$PROJECT_DIR$/fleet/kernel/fleet.kernel.iml" filepath="$PROJECT_DIR$/fleet/kernel/fleet.kernel.iml" />
       <module fileurl="file://$PROJECT_DIR$/fleet/ktor/client/cio/fleet.ktor.client.cio.iml" filepath="$PROJECT_DIR$/fleet/ktor/client/cio/fleet.ktor.client.cio.iml" />
       <module fileurl="file://$PROJECT_DIR$/fleet/ktor/client/core/fleet.ktor.client.core.iml" filepath="$PROJECT_DIR$/fleet/ktor/client/core/fleet.ktor.client.core.iml" />
@@ -36,6 +35,7 @@
       <module fileurl="file://$PROJECT_DIR$/fleet/rhizomedb.transactor.rebase/fleet.rhizomedb.transactor.rebase.iml" filepath="$PROJECT_DIR$/fleet/rhizomedb.transactor.rebase/fleet.rhizomedb.transactor.rebase.iml" />
       <module fileurl="file://$PROJECT_DIR$/fleet/rpc/fleet.rpc.iml" filepath="$PROJECT_DIR$/fleet/rpc/fleet.rpc.iml" />
       <module fileurl="file://$PROJECT_DIR$/fleet/rpc.server/fleet.rpc.server.iml" filepath="$PROJECT_DIR$/fleet/rpc.server/fleet.rpc.server.iml" />
+      <module fileurl="file://$PROJECT_DIR$/fleet/test-runtime/fleet.test.runtime.iml" filepath="$PROJECT_DIR$/fleet/test-runtime/fleet.test.runtime.iml" />
       <module fileurl="file://$PROJECT_DIR$/fleet/util/codepoints/fleet.util.codepoints.iml" filepath="$PROJECT_DIR$/fleet/util/codepoints/fleet.util.codepoints.iml" />
       <module fileurl="file://$PROJECT_DIR$/fleet/util/codepoints/test/fleet.util.codepoints.test.iml" filepath="$PROJECT_DIR$/fleet/util/codepoints/test/fleet.util.codepoints.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/fleet/util/core/fleet.util.core.iml" filepath="$PROJECT_DIR$/fleet/util/core/fleet.util.core.iml" />
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index ea7e15ef24e4..e93a65538652 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -234,7 +234,6 @@ fleet/codecache
 fleet/codecache/test
 fleet/compiler-plugins
 fleet/fastutil
-fleet/junit
 fleet/kernel
 fleet/ktor/client/cio
 fleet/ktor/client/core
@@ -252,6 +251,7 @@ fleet/rhizomedb.transactor
 fleet/rhizomedb.transactor.rebase
 fleet/rpc
 fleet/rpc.server
+fleet/test-runtime
 fleet/util/codepoints
 fleet/util/codepoints/test
 fleet/util/core
diff --git a/fleet/build/fs/BUILD.bazel b/fleet/build/fs/BUILD.bazel
index 9990f10f50bd..599ed1050b5c 100644
--- a/fleet/build/fs/BUILD.bazel
+++ b/fleet/build/fs/BUILD.bazel
@@ -48,7 +48,7 @@ jvm_library(
     "@lib//:slf4j-api",
     "@lib//:fleet-github-luben-zstd-jni",
     "@lib//:fleet-tukaani-xz",
-    "//fleet/junit",
+    "//fleet/test-runtime",
     "@lib//:commons-compress",
     "@lib//:commons-io",
     "@lib//:commons-lang3",
diff --git a/fleet/build/fs/fleet.build.fs.iml b/fleet/build/fs/fleet.build.fs.iml
index 24223540b5ed..86dea84cfac3 100644
--- a/fleet/build/fs/fleet.build.fs.iml
+++ b/fleet/build/fs/fleet.build.fs.iml
@@ -29,7 +29,7 @@
     <orderEntry type="library" name="slf4j-api" level="project" />
     <orderEntry type="library" name="fleet:github.luben.zstd.jni" level="project" />
     <orderEntry type="library" name="fleet:tukaani.xz" level="project" />
-    <orderEntry type="module" module-name="fleet.junit" scope="TEST" />
+    <orderEntry type="module" module-name="fleet.test.runtime" scope="TEST" />
     <orderEntry type="library" name="commons-compress" level="project" />
     <orderEntry type="library" name="commons-io" level="project" />
     <orderEntry type="library" name="commons-lang3" level="project" />
diff --git a/fleet/build/fs/gradlebuild/build.gradle.kts b/fleet/build/fs/gradlebuild/build.gradle.kts
index 29b45eb5ad4b..1edfd0d99a2f 100644
--- a/fleet/build/fs/gradlebuild/build.gradle.kts
+++ b/fleet/build/fs/gradlebuild/build.gradle.kts
@@ -66,7 +66,7 @@ kotlin {
     }
   }
   sourceSets.commonTest.dependencies {
-    implementation(project(":fleet.junit"))
+    implementation(project(":fleet.test.runtime"))
   }
   // KOTLIN__MARKER_END
 }
\ No newline at end of file
diff --git a/fleet/build/http/BUILD.bazel b/fleet/build/http/BUILD.bazel
index 9d9c94dd0ec1..b00aa387d017 100644
--- a/fleet/build/http/BUILD.bazel
+++ b/fleet/build/http/BUILD.bazel
@@ -48,7 +48,7 @@ jvm_library(
     "//fleet/build/fs:fs_test_lib",
     "@lib//:fleet-io-ktor-client-logging",
     "@lib//:slf4j-api",
-    "//fleet/junit",
+    "//fleet/test-runtime",
     "@lib//:fleet-io-ktor-client-mock",
   ],
   exports = [
diff --git a/fleet/build/http/fleet.build.http.iml b/fleet/build/http/fleet.build.http.iml
index 6401d8887e8a..959802935fdd 100644
--- a/fleet/build/http/fleet.build.http.iml
+++ b/fleet/build/http/fleet.build.http.iml
@@ -30,7 +30,7 @@
     <orderEntry type="module" module-name="fleet.build.fs" />
     <orderEntry type="library" name="fleet:io.ktor.client.logging" level="project" />
     <orderEntry type="library" name="slf4j-api" level="project" />
-    <orderEntry type="module" module-name="fleet.junit" scope="TEST" />
+    <orderEntry type="module" module-name="fleet.test.runtime" scope="TEST" />
     <orderEntry type="library" name="fleet:io.ktor.client.mock" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/fleet/build/http/gradlebuild/build.gradle.kts b/fleet/build/http/gradlebuild/build.gradle.kts
index 087383e43de6..7659cb3339ba 100644
--- a/fleet/build/http/gradlebuild/build.gradle.kts
+++ b/fleet/build/http/gradlebuild/build.gradle.kts
@@ -66,7 +66,7 @@ kotlin {
     implementation(project(":fleet.build.fs"))
   }
   sourceSets.commonTest.dependencies {
-    implementation(project(":fleet.junit"))
+    implementation(project(":fleet.test.runtime"))
   }
   // KOTLIN__MARKER_END
 }
\ No newline at end of file
diff --git a/fleet/build/s3/BUILD.bazel b/fleet/build/s3/BUILD.bazel
index 8fa3e294d64a..f56debad783b 100644
--- a/fleet/build/s3/BUILD.bazel
+++ b/fleet/build/s3/BUILD.bazel
@@ -43,7 +43,7 @@ jvm_library(
     "@lib//:kotlinx-coroutines-core",
     "@lib//:fleet-aws-sdk-kotlin-s3-jvm",
     "@lib//:slf4j-api",
-    "//fleet/junit",
+    "//fleet/test-runtime",
     "@lib//:kotlinx-coroutines-test",
   ]
 )
diff --git a/fleet/build/s3/fleet.build.s3.iml b/fleet/build/s3/fleet.build.s3.iml
index 7bf31cc1e677..c1f4005aa291 100644
--- a/fleet/build/s3/fleet.build.s3.iml
+++ b/fleet/build/s3/fleet.build.s3.iml
@@ -30,7 +30,7 @@
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="fleet:aws.sdk.kotlin.s3.jvm" level="project" />
     <orderEntry type="library" name="slf4j-api" level="project" />
-    <orderEntry type="module" module-name="fleet.junit" scope="TEST" />
+    <orderEntry type="module" module-name="fleet.test.runtime" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-test" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/fleet/build/s3/gradlebuild/build.gradle.kts b/fleet/build/s3/gradlebuild/build.gradle.kts
index cbbaa9464002..2ce732b8124e 100644
--- a/fleet/build/s3/gradlebuild/build.gradle.kts
+++ b/fleet/build/s3/gradlebuild/build.gradle.kts
@@ -71,7 +71,7 @@ kotlin {
     implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.test.jvm1610416103.get().let { "${it.group}:kotlinx-coroutines-test:${it.version}" }) {
       isTransitive = false
     }
-    implementation(project(":fleet.junit"))
+    implementation(project(":fleet.test.runtime"))
   }
   // KOTLIN__MARKER_END
 }
\ No newline at end of file
diff --git a/fleet/codecache/test/BUILD.bazel b/fleet/codecache/test/BUILD.bazel
index 308c9ae835bd..b3203489e76b 100644
--- a/fleet/codecache/test/BUILD.bazel
+++ b/fleet/codecache/test/BUILD.bazel
@@ -28,7 +28,7 @@ jvm_library(
   kotlinc_opts = ":custom_test",
   deps = [
     "@lib//:kotlin-stdlib",
-    "//fleet/junit",
+    "//fleet/test-runtime",
     "//fleet/codecache",
     "@lib//:kotlinx-coroutines-core",
     "//fleet/bundles",
diff --git a/fleet/codecache/test/fleet.codecache.test.iml b/fleet/codecache/test/fleet.codecache.test.iml
index b31e6ee6bc48..d17e990c7f08 100644
--- a/fleet/codecache/test/fleet.codecache.test.iml
+++ b/fleet/codecache/test/fleet.codecache.test.iml
@@ -33,7 +33,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="fleet.junit" scope="TEST" />
+    <orderEntry type="module" module-name="fleet.test.runtime" scope="TEST" />
     <orderEntry type="module" module-name="fleet.codecache" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="module" module-name="fleet.bundles" scope="TEST" />
diff --git a/fleet/codecache/test/gradlebuild/build.gradle.kts b/fleet/codecache/test/gradlebuild/build.gradle.kts
index 49654fe2b2b0..7b76809d7f2b 100644
--- a/fleet/codecache/test/gradlebuild/build.gradle.kts
+++ b/fleet/codecache/test/gradlebuild/build.gradle.kts
@@ -56,7 +56,7 @@ kotlin {
     implementation(jps.org.jetbrains.kotlinx.kotlinx.serialization.core.jvm1739247612.get().let { "${it.group}:kotlinx-serialization-core:${it.version}" }) {
       isTransitive = false
     }
-    implementation(project(":fleet.junit"))
+    implementation(project(":fleet.test.runtime"))
     implementation(project(":fleet.codecache"))
     implementation(project(":fleet.bundles"))
     implementation(project(":fleet.util.network"))
diff --git a/fleet/junit/BUILD.bazel b/fleet/test-runtime/BUILD.bazel
similarity index 80%
rename from fleet/junit/BUILD.bazel
rename to fleet/test-runtime/BUILD.bazel
index 0ee9aaf44b97..849137c700ee 100644
--- a/fleet/junit/BUILD.bazel
+++ b/fleet/test-runtime/BUILD.bazel
@@ -1,8 +1,8 @@
-### auto-generated section `build fleet.junit` start
+### auto-generated section `build fleet.test.runtime` start
 load("@rules_jvm//:jvm.bzl", "jvm_library")
 
 jvm_library(
-  name = "junit",
+  name = "test-runtime",
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True, exclude = ["**/module-info.java"]),
   exports = [
@@ -24,4 +24,4 @@ jvm_library(
     "@lib//:kotlin-test",
   ]
 )
-### auto-generated section `build fleet.junit` end
\ No newline at end of file
+### auto-generated section `build fleet.test.runtime` end
\ No newline at end of file
diff --git a/fleet/junit/fleet.junit.iml b/fleet/test-runtime/fleet.test.runtime.iml
similarity index 100%
rename from fleet/junit/fleet.junit.iml
rename to fleet/test-runtime/fleet.test.runtime.iml
diff --git a/fleet/junit/gradlebuild/build.gradle.kts b/fleet/test-runtime/gradlebuild/build.gradle.kts
similarity index 99%
rename from fleet/junit/gradlebuild/build.gradle.kts
rename to fleet/test-runtime/gradlebuild/build.gradle.kts
index 8b00c80d09a0..7ad0c084cab2 100644
--- a/fleet/junit/gradlebuild/build.gradle.kts
+++ b/fleet/test-runtime/gradlebuild/build.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 
 fleetModule {
   module {
-    name = "fleet.junit"
+    name = "fleet.test.runtime"
     importedFromJps {}
   }
 }
diff --git a/fleet/util/codepoints/test/BUILD.bazel b/fleet/util/codepoints/test/BUILD.bazel
index a527b8d8d531..810befd220ce 100644
--- a/fleet/util/codepoints/test/BUILD.bazel
+++ b/fleet/util/codepoints/test/BUILD.bazel
@@ -24,7 +24,7 @@ jvm_library(
   deps = [
     "//fleet/util/codepoints",
     "@lib//:kotlin-stdlib",
-    "//fleet/junit",
+    "//fleet/test-runtime",
   ],
   runtime_deps = [":test"]
 )
diff --git a/fleet/util/codepoints/test/fleet.util.codepoints.test.iml b/fleet/util/codepoints/test/fleet.util.codepoints.test.iml
index ff54ad92436e..6441709b7857 100644
--- a/fleet/util/codepoints/test/fleet.util.codepoints.test.iml
+++ b/fleet/util/codepoints/test/fleet.util.codepoints.test.iml
@@ -25,6 +25,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="fleet.util.codepoints" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="fleet.junit" scope="TEST" />
+    <orderEntry type="module" module-name="fleet.test.runtime" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/fleet/util/codepoints/test/gradlebuild/build.gradle.kts b/fleet/util/codepoints/test/gradlebuild/build.gradle.kts
index 3dc82289b238..4693e07e10d9 100644
--- a/fleet/util/codepoints/test/gradlebuild/build.gradle.kts
+++ b/fleet/util/codepoints/test/gradlebuild/build.gradle.kts
@@ -58,7 +58,7 @@ kotlin {
       exclude(group = "org.jetbrains", module = "annotations")
     }
     implementation(project(":fleet.util.codepoints"))
-    implementation(project(":fleet.junit"))
+    implementation(project(":fleet.test.runtime"))
   }
   // KOTLIN__MARKER_END
 }
\ No newline at end of file