diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 64697efd2..d074d30b7 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -384,7 +384,9 @@ tasks.withType<AbstractDokkaLeafTask>().configureEach {
 
     failOnWarning.set(true)
     dokkaSourceSets.configureEach {
-        kotlin.sourceSets.commonTest.get().kotlin.srcDirs.forEach { samples.from(it) }
+        val testSourceSet = kotlin.sourceSets.named("${name.dropLast(4)}Test")
+        samples.from(testSourceSet.map { it.kotlin.srcDirs })
+
         // reportUndocumented.set(true) // much noisy output about `hashCode` and serializer encoders, decoders etc
         skipDeprecated.set(true)
         // Enum members and undocumented toString()
diff --git a/gradle.properties b/gradle.properties
index 5322c3c18..7067468fd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ versionSuffix=SNAPSHOT
 tzdbVersion=2025b
 
 defaultKotlinVersion=2.1.0
-dokkaVersion=1.9.20
+dokkaVersion=2.0.0
 serializationVersion=1.6.2
 benchmarksVersion=0.7.2
 bcvVersion=0.17.0