diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/integration/KafkaNullConverterTest.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/integration/KafkaNullConverterTest.java
index dc7a862b8..166bdf45d 100644
--- a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/integration/KafkaNullConverterTest.java
+++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/integration/KafkaNullConverterTest.java
@@ -33,6 +33,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.support.KafkaNull;
 import org.springframework.kafka.test.context.EmbeddedKafka;
+import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.messaging.support.GenericMessage;
@@ -100,9 +101,13 @@ public class KafkaNullConverterTest {
 		}
 
 		@Bean
-		public Consumer<byte[]> inputListen() {
+		public Consumer<Message<byte[]>> inputListen() {
 			return in -> {
-				this.inputPayload = in;
+				Object v = in.getPayload();
+				String className = v.getClass().getName();
+				if (className.equals("org.springframework.kafka.support.KafkaNull")) {
+					this.inputPayload = null;
+				}
 				countDownLatchInput.countDown();
 			};
 		}