diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScan.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScan.java
index efd76677373d..8479bd052214 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScan.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScan.java
@@ -120,7 +120,8 @@ protected void assertTraceContinuity() {
         hasParentSpanId(parentSpanId), hasStatusWithCode(StatusCode.OK), hasEnded());
     waitForSpan(scanOperationSpanMatcher);
     final String scanOperationSpanId = spanStream().filter(scanOperationSpanMatcher::matches)
-      .map(SpanData::getSpanId).findAny().get();
+      .max((a, b) -> Long.compare(a.getEndEpochNanos(), b.getEndEpochNanos()))
+      .map(SpanData::getSpanId).get();
 
     final Matcher<SpanData> onNextMatcher = hasName("TracedScanResultConsumer#onNext");
     waitForSpan(onNextMatcher);
@@ -157,7 +158,8 @@ protected void assertTraceContinuity() {
         hasException(exceptionMatcher), hasEnded());
     waitForSpan(scanOperationSpanMatcher);
     final String scanOperationSpanId = spanStream().filter(scanOperationSpanMatcher::matches)
-      .map(SpanData::getSpanId).findAny().get();
+      .max((a, b) -> Long.compare(a.getEndEpochNanos(), b.getEndEpochNanos()))
+      .map(SpanData::getSpanId).get();
 
     final Matcher<SpanData> onErrorMatcher = hasName("TracedScanResultConsumer#onError");
     waitForSpan(onErrorMatcher);