diff --git a/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaAppSecHandlerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaAppSecHandlerTest.groovy
index 750cfe4ab78..81410905dc3 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaAppSecHandlerTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaAppSecHandlerTest.groovy
@@ -28,8 +28,12 @@ class LambdaAppSecHandlerTest extends DDCoreSpecification {
   @Shared
   def originalAppSecActive
 
+  @Shared
+  AgentTracer.TracerAPI originalTracer
+
   def setupSpec() {
     originalAppSecActive = ActiveSubsystems.APPSEC_ACTIVE
+    originalTracer = AgentTracer.get()
   }
 
   def cleanupSpec() {
@@ -1438,7 +1442,6 @@ class LambdaAppSecHandlerTest extends DDCoreSpecification {
   }
 
   def cleanup() {
-    // Reset tracer after each test
-    AgentTracer.forceRegister(null)
+    AgentTracer.forceRegister(originalTracer)
   }
 }