diff --git a/fleet/build/fs/gradlebuild/build.gradle.kts b/fleet/build/fs/gradlebuild/build.gradle.kts
index 710f7eba6385..29b45eb5ad4b 100644
--- a/fleet/build/fs/gradlebuild/build.gradle.kts
+++ b/fleet/build/fs/gradlebuild/build.gradle.kts
@@ -65,7 +65,7 @@ kotlin {
       isTransitive = false
     }
   }
-  sourceSets.jvmTest.dependencies {
+  sourceSets.commonTest.dependencies {
     implementation(project(":fleet.junit"))
   }
   // KOTLIN__MARKER_END
diff --git a/fleet/build/http/gradlebuild/build.gradle.kts b/fleet/build/http/gradlebuild/build.gradle.kts
index 52996b2d4901..087383e43de6 100644
--- a/fleet/build/http/gradlebuild/build.gradle.kts
+++ b/fleet/build/http/gradlebuild/build.gradle.kts
@@ -65,7 +65,7 @@ kotlin {
     api(project(":fleet.ktor.client.core"))
     implementation(project(":fleet.build.fs"))
   }
-  sourceSets.jvmTest.dependencies {
+  sourceSets.commonTest.dependencies {
     implementation(project(":fleet.junit"))
   }
   // KOTLIN__MARKER_END
diff --git a/fleet/build/s3/gradlebuild/build.gradle.kts b/fleet/build/s3/gradlebuild/build.gradle.kts
index 3189243659f6..cbbaa9464002 100644
--- a/fleet/build/s3/gradlebuild/build.gradle.kts
+++ b/fleet/build/s3/gradlebuild/build.gradle.kts
@@ -71,8 +71,6 @@ kotlin {
     implementation(jps.org.jetbrains.intellij.deps.kotlinx.kotlinx.coroutines.test.jvm1610416103.get().let { "${it.group}:kotlinx-coroutines-test:${it.version}" }) {
       isTransitive = false
     }
-  }
-  sourceSets.jvmTest.dependencies {
     implementation(project(":fleet.junit"))
   }
   // KOTLIN__MARKER_END
diff --git a/fleet/codecache/test/gradlebuild/build.gradle.kts b/fleet/codecache/test/gradlebuild/build.gradle.kts
index 737b7ad1c5e1..49654fe2b2b0 100644
--- a/fleet/codecache/test/gradlebuild/build.gradle.kts
+++ b/fleet/codecache/test/gradlebuild/build.gradle.kts
@@ -56,13 +56,11 @@ 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.codecache"))
     implementation(project(":fleet.bundles"))
     implementation(project(":fleet.util.network"))
     implementation(project(":fleet.ktor.client.core"))
   }
-  sourceSets.jvmTest.dependencies {
-    implementation(project(":fleet.junit"))
-  }
   // KOTLIN__MARKER_END
 }
\ No newline at end of file
diff --git a/fleet/junit/gradlebuild/build.gradle.kts b/fleet/junit/gradlebuild/build.gradle.kts
index aabe694089b3..8b00c80d09a0 100644
--- a/fleet/junit/gradlebuild/build.gradle.kts
+++ b/fleet/junit/gradlebuild/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
   alias(libs.plugins.kotlin.multiplatform)
   id("fleet.project-module-conventions")
   id("fleet.toolchain-conventions")
-  alias(libs.plugins.dokka)
   // GRADLE_PLUGINS__MARKER_START
   id("fleet-module")
   // GRADLE_PLUGINS__MARKER_END
@@ -24,6 +23,9 @@ fleetModule {
 kotlin {
   // KOTLIN__MARKER_START
   jvm {}
+  wasmJs {
+    browser {}
+  }
   sourceSets.commonMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcCommonMain")) }
   sourceSets.commonMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesCommonMain")) }
   sourceSets.commonTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcCommonTest")) }
@@ -34,7 +36,16 @@ kotlin {
   sourceSets.jvmTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcJvmTest")) }
   configureAtMostOneJvmTargetOrThrow { compilations.named("test") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.projectDirectory.dir("../srcJvmTest")) } } }
   sourceSets.jvmTest.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesJvmTest")) }
+  sourceSets.wasmJsMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcWasmJsMain")) }
+  sourceSets.wasmJsMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesWasmJsMain")) }
+  sourceSets.wasmJsTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcWasmJsTest")) }
+  sourceSets.wasmJsTest.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesWasmJsTest")) }
   sourceSets.commonMain.dependencies {
+    api(jps.org.jetbrains.kotlin.kotlin.test542871666.get().let { "${it.group}:${it.name}:${it.version}" }) {
+      exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
+    }
+  }
+  sourceSets.jvmMain.dependencies {
     api(jps.org.junit.jupiter.junit.jupiter.api1894444205.get())
     api(jps.org.junit.jupiter.junit.jupiter.params1101092435.get().let { "${it.group}:${it.name}:${it.version}" }) {
       isTransitive = false
@@ -53,9 +64,6 @@ kotlin {
     api(jps.org.jetbrains.kotlin.kotlin.test.junit5960045374.get().let { "${it.group}:${it.name}:${it.version}" }) {
       isTransitive = false
     }
-    api(jps.org.jetbrains.kotlin.kotlin.test542871666.get().let { "${it.group}:${it.name}:${it.version}" }) {
-      exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
-    }
   }
   // KOTLIN__MARKER_END
 }
\ 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 1ca896afe67d..3dc82289b238 100644
--- a/fleet/util/codepoints/test/gradlebuild/build.gradle.kts
+++ b/fleet/util/codepoints/test/gradlebuild/build.gradle.kts
@@ -58,8 +58,6 @@ kotlin {
       exclude(group = "org.jetbrains", module = "annotations")
     }
     implementation(project(":fleet.util.codepoints"))
-  }
-  sourceSets.jvmTest.dependencies {
     implementation(project(":fleet.junit"))
   }
   // KOTLIN__MARKER_END