diff --git a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java
index 692dbb755..a6a3d14ff 100644
--- a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java
+++ b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java
@@ -17,6 +17,7 @@
 package org.springframework.cloud.sleuth.stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.in;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.atLeastOnce;
@@ -27,6 +28,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 import javax.annotation.PostConstruct;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
@@ -79,7 +81,7 @@ public class StreamSpanListenerTests {
 	@Autowired
 	SpanReporter spanReporter;
 
-	@PostConstruct
+	@Before
 	public void init() {
 		this.test.spans.clear();
 	}
@@ -175,7 +177,9 @@ public class StreamSpanListenerTests {
 		StreamSpanReporter listener;
 
 		@ServiceActivator(inputChannel = SleuthSource.OUTPUT)
-		public void handle(Message<?> msg) {
+		public void handle(Spans input) {
+			this.spans.clear();
+			this.spans.addAll(input.getSpans());
 		}
 
 		@Bean
@@ -184,7 +188,7 @@ public class StreamSpanListenerTests {
 		}
 
 		@Bean
-		public Sampler defaultSampler() {
+		Sampler defaultSampler() {
 			return new AlwaysSampler();
 		}