diff --git a/spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/mockito/LambdaAnswer.java b/spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/mockito/LambdaAnswer.java
index 69c6c1d7..191fc447 100644
--- a/spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/mockito/LambdaAnswer.java
+++ b/spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/mockito/LambdaAnswer.java
@@ -23,13 +23,12 @@ import java.util.Set;
 
 import org.mockito.internal.stubbing.defaultanswers.ForwardsInvocations;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
 import org.springframework.lang.Nullable;
 
 /**
- * An {@link Answer} to optionally call the real method and allow returning a
- * custom result. Captures any exceptions thrown.
+ * An {@link org.mockito.stubbing.Answer} to optionally call the real method and allow
+ * returning a custom result. Captures any exceptions thrown.
  *
  * @param <T> the return type.
  *
diff --git a/spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/mockito/LatchCountDownAndCallRealMethodAnswer.java b/spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/mockito/LatchCountDownAndCallRealMethodAnswer.java
index 95b75587..b61cbba6 100644
--- a/spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/mockito/LatchCountDownAndCallRealMethodAnswer.java
+++ b/spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/mockito/LatchCountDownAndCallRealMethodAnswer.java
@@ -25,13 +25,12 @@ import java.util.concurrent.TimeUnit;
 
 import org.mockito.internal.stubbing.defaultanswers.ForwardsInvocations;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
 import org.springframework.lang.Nullable;
 
 /**
- * An {@link Answer} for void returning methods that calls the real method and counts down
- * a latch. Captures any exceptions thrown.
+ * An {@link org.mockito.stubbing.Answer} for void returning methods that calls the real
+ * method and counts down a latch. Captures any exceptions thrown.
  *
  * @author Gary Russell
  * @since 1.6
@@ -40,7 +39,7 @@ import org.springframework.lang.Nullable;
 @SuppressWarnings("serial")
 public class LatchCountDownAndCallRealMethodAnswer extends ForwardsInvocations {
 
-	private final CountDownLatch latch;
+	private final transient CountDownLatch latch;
 
 	private final Set<Exception> exceptions = Collections.synchronizedSet(new LinkedHashSet<>());