diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/annotation/SleuthSpanCreatorAspectTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/annotation/SleuthSpanCreatorAspectTests.java
index ba2ec66d2..f746c968e 100644
--- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/annotation/SleuthSpanCreatorAspectTests.java
+++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/annotation/SleuthSpanCreatorAspectTests.java
@@ -50,6 +50,7 @@ public abstract class SleuthSpanCreatorAspectTests {
 	@BeforeEach
 	public void setup() {
 		this.spans.clear();
+		this.tracer.withSpan(null);
 	}
 
 	@Test