diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/KafkaProducerMetrics.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/KafkaProducerMetrics.java
index b8ea762e27f5..3c6fe2691e2a 100644
--- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/KafkaProducerMetrics.java
+++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/KafkaProducerMetrics.java
@@ -61,15 +61,15 @@ public KafkaProducerMetrics(Metrics metrics) {
         );
         sendOffsetsSensor = newLatencySensor(
             TXN_SEND_OFFSETS,
-            "Total time producer has spent in sendOffsetsToTransaction."
+            "Total time producer has spent in sendOffsetsToTransaction in nanoseconds."
         );
         commitTxnSensor = newLatencySensor(
             TXN_COMMIT,
-            "Total time producer has spent in commitTransaction."
+            "Total time producer has spent in commitTransaction in nanoseconds."
         );
         abortTxnSensor = newLatencySensor(
             TXN_ABORT,
-            "Total time producer has spent in abortTransaction."
+            "Total time producer has spent in abortTransaction in nanoseconds."
         );
     }
 
diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java
index c48c3feed609..b69fe56a57ba 100644
--- a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java
+++ b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java
@@ -1061,7 +1061,7 @@ private void assertDurationAtLeast(KafkaProducer<?, ?> producer, String name, do
 
     private double getAndAssertDurationAtLeast(KafkaProducer<?, ?> producer, String name, double floor) {
         double value = getMetricValue(producer, name);
-        assertTrue(value > floor);
+        assertTrue(value >= floor);
         return value;
     }
 
diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/metrics/ThreadMetrics.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/metrics/ThreadMetrics.java
index 8912f6e58d52..9c3e80949718 100644
--- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/metrics/ThreadMetrics.java
+++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/metrics/ThreadMetrics.java
@@ -95,7 +95,7 @@ private ThreadMetrics() {}
     private static final String COMMIT_RATIO_DESCRIPTION =
         "The fraction of time the thread spent on committing all tasks";
     private static final String BLOCKED_TIME_DESCRIPTION =
-        "The total time the thread spent blocked on kafka";
+        "The total time the thread spent blocked on kafka in nanoseconds";
     private static final String THREAD_START_TIME_DESCRIPTION =
         "The time that the thread was started";
 
diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/ThreadMetricsTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/ThreadMetricsTest.java
index 0a486db812dc..6ed97ebf7cbe 100644
--- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/ThreadMetricsTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/ThreadMetricsTest.java
@@ -433,7 +433,7 @@ public void shouldAddTotalBlockedTimeMetric() {
         final ArgumentCaptor<Gauge<Double>> captor = gaugeCaptor();
         verify(streamsMetrics).addThreadLevelMutableMetric(
             eq("blocked-time-ns-total"),
-            eq("The total time the thread spent blocked on kafka"),
+            eq("The total time the thread spent blocked on kafka in nanoseconds"),
             eq("burger"),
             captor.capture()
         );