diff --git a/src/main/kotlin/org/wfanet/measurement/common/Flow.kt b/src/main/kotlin/org/wfanet/measurement/common/Flow.kt
index ebd2aeccb..1a28e4db3 100644
--- a/src/main/kotlin/org/wfanet/measurement/common/Flow.kt
+++ b/src/main/kotlin/org/wfanet/measurement/common/Flow.kt
@@ -146,8 +146,8 @@ private class SingleConsumedFlowItem<T>(singleItem: T) : ConsumedFlowItem<T>() {
  *
  * @param producerContext [CoroutineContext] for producing the returned items
  * @return a [ConsumedFlowItem] containing the first item and the [Flow] of remaining items, or
- *   `null` if there is no first item. The caller must ensure that the returned object is [closed]
- *   [ConsumedFlowItem.close].
+ *   `null` if there is no first item. The caller must ensure that the returned object is
+ *   [closed][ConsumedFlowItem.close].
  */
 @OptIn(
   DelicateCoroutinesApi::class // For `Channel.isClosedForReceive`.
diff --git a/src/main/kotlin/org/wfanet/measurement/common/testing/CloseableResource.kt b/src/main/kotlin/org/wfanet/measurement/common/testing/CloseableResource.kt
index abe38adaa..906dd4d33 100644
--- a/src/main/kotlin/org/wfanet/measurement/common/testing/CloseableResource.kt
+++ b/src/main/kotlin/org/wfanet/measurement/common/testing/CloseableResource.kt
@@ -23,8 +23,8 @@ import org.junit.runners.model.Statement
  * evaluation.
  *
  * This can replace [ExternalResource][org.junit.rules.ExternalResource], which does not guarantee
- * that [after][org.junit.rules.ExternalResource.after] is invoked if [before]
- * [org.junit.rules.ExternalResource.before] throws an exception.
+ * that [after][org.junit.rules.ExternalResource.after] is invoked if
+ * [before][org.junit.rules.ExternalResource.before] throws an exception.
  */
 open class CloseableResource<T : AutoCloseable>(private val createResource: () -> T) : TestRule {
   protected lateinit var resource: T
diff --git a/src/main/kotlin/org/wfanet/measurement/gcloud/spanner/testing/UsingSpannerEmulator.kt b/src/main/kotlin/org/wfanet/measurement/gcloud/spanner/testing/UsingSpannerEmulator.kt
index 58f4ee3b8..e64df3788 100644
--- a/src/main/kotlin/org/wfanet/measurement/gcloud/spanner/testing/UsingSpannerEmulator.kt
+++ b/src/main/kotlin/org/wfanet/measurement/gcloud/spanner/testing/UsingSpannerEmulator.kt
@@ -19,8 +19,8 @@ import org.junit.Rule
 import org.wfanet.measurement.gcloud.spanner.AsyncDatabaseClient
 
 /**
- * Base class for JUnit4 tests using Cloud Spanner databases running in a test [Instance]
- * [com.google.cloud.spanner.Instance] in Cloud Spanner Emulator.
+ * Base class for JUnit4 tests using Cloud Spanner databases running in a test
+ * [Instance][com.google.cloud.spanner.Instance] in Cloud Spanner Emulator.
  *
  * One emulator and test instance is created per test class, and one database is created per test
  * case method. The [AsyncDatabaseClient] is accessible via the [databaseClient] property.