diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
index 82d0080d18..7caf739cd7 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
@@ -624,9 +624,13 @@ public Criteria intersects(GeoJson geoJson) {
 	}
 
 	/**
-	 * Creates a geo-spatial criterion using a {@literal $maxDistance} operation, for use with $near
+	 * Creates a geo-spatial criterion using a {@literal $maxDistance} operation, for use with {@literal $near} or
+	 * {@literal $nearSphere}.
+	 * <p>
+	 * <strong>NOTE:</strong> The unit of measure for distance may depends on the used coordinate representation
+	 * (legacy vs. geoJson) as well as the target operation.
 	 *
-	 * @param maxDistance
+	 * @param maxDistance radians or meters
 	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/maxDistance/">MongoDB Query operator:
 	 *      $maxDistance</a>
@@ -645,8 +649,11 @@ public Criteria maxDistance(double maxDistance) {
 	/**
 	 * Creates a geospatial criterion using a {@literal $minDistance} operation, for use with {@literal $near} or
 	 * {@literal $nearSphere}.
+	 * <p>
+	 * <strong>NOTE:</strong> The unit of measure for distance may depends on the used coordinate representation
+	 * (legacy vs. geoJson) as well as the target operation.
 	 *
-	 * @param minDistance
+	 * @param minDistance radians or meters
 	 * @return this.
 	 * @since 1.7
 	 */
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CountQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CountQueryUnitTests.java
index 473227a857..b57a5d5d58 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CountQueryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CountQueryUnitTests.java
@@ -15,17 +15,13 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.mockito.Mockito.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.geo.Point;
-import org.springframework.data.mongodb.MongoDatabaseFactory;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.convert.QueryMapper;