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 07da4936b..efb75792e 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
@@ -16,6 +16,16 @@
 
 package org.springframework.cloud.sleuth.stream;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
@@ -44,15 +54,6 @@ import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.Message;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.verify;
-
 /**
  * @author Dave Syer
  *
@@ -96,9 +97,9 @@ public class StreamSpanListenerTests {
 
 	@Test
 	public void nullSpanName() {
-		Span context = this.tracer.startTrace(null, null);
-		this.application.publishEvent(new ClientSentEvent(this, context));
-		this.tracer.close(context);
+		Span span = this.tracer.startTrace(null);
+		this.application.publishEvent(new ClientSentEvent(this, span));
+		this.tracer.close(span);
 		assertEquals(1, this.test.spans.size());
 		this.listener.poll();
 		assertEquals(0, this.test.spans.size());