diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java
index 4cd3f4a9d..d437257fc 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java
@@ -39,13 +39,16 @@ public class TraceReactorAutoConfiguration {
 	@Configuration
 	@ConditionalOnBean(Tracing.class)
 	static class TraceReactorConfiguration {
+
+		private static final String SLEUTH_TRACE_REACTOR_KEY = TraceReactorConfiguration.class.getName();
+
 		@Autowired Tracing tracing;
 		@Autowired BeanFactory beanFactory;
 		@Autowired LastOperatorWrapper lastOperatorWrapper;
 
 		@Bean
 		@ConditionalOnNotWebApplication LastOperatorWrapper spanOperator() {
-			return tracer -> Hooks.onLastOperator(ReactorSleuth.spanOperator(tracer));
+			return tracer -> Hooks.onLastOperator(SLEUTH_TRACE_REACTOR_KEY, ReactorSleuth.spanOperator(tracer));
 		}
 
 		@Bean
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriberTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriberTests.java
index dcc1484e7..5a82ae1d0 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriberTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriberTests.java
@@ -210,7 +210,6 @@ public class SpanSubscriberTests {
 	}
 
 	@AfterClass
-	@BeforeClass
 	public static void cleanup() {
 		Hooks.resetOnLastOperator();
 		Schedulers.resetFactory();