diff --git a/gradle/java.gradle b/gradle/java.gradle
index baae3d936c1b..c507e0b199ae 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -221,6 +221,12 @@ tasks.withType(Test).configureEach {
   testLogging {
     exceptionFormat = 'full'
   }
+
+  // There's no real harm in setting this for all tests even if any happen to not be using context
+  // propagation.
+  jvmArgs "-Dio.opentelemetry.context.enableStrictContext=true"
+  // TODO(anuraaga): Have agent map unshaded to shaded.
+  jvmArgs "-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=true"
 }
 
 tasks.withType(AbstractArchiveTask) {
diff --git a/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle b/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle
index a7846b594f92..f3ca5270ff0b 100644
--- a/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle
+++ b/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle
@@ -62,3 +62,8 @@ compileVersion101TestGroovy {
   classpath = classpath.plus(files(compileVersion101TestScala.destinationDir))
   dependsOn compileVersion101TestScala
 }
+
+tasks.withType(Test) {
+  // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/2639
+  jvmArgs "-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=false"
+}
\ No newline at end of file
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java
index 9e650f3e4520..0a2096dedef8 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java
@@ -128,10 +128,6 @@ private void populateGenericAttributes(Span span, ExecutionAttributes attributes
   @Override
   public void afterExecution(
       Context.AfterExecution context, ExecutionAttributes executionAttributes) {
-    Scope scope = executionAttributes.getAttribute(SCOPE_ATTRIBUTE);
-    if (scope != null) {
-      scope.close();
-    }
     io.opentelemetry.context.Context otelContext = getContext(executionAttributes);
     clearAttributes(executionAttributes);
     Span span = Span.fromContext(otelContext);
@@ -168,6 +164,10 @@ public void onExecutionFailure(
   }
 
   private void clearAttributes(ExecutionAttributes executionAttributes) {
+    Scope scope = executionAttributes.getAttribute(SCOPE_ATTRIBUTE);
+    if (scope != null) {
+      scope.close();
+    }
     executionAttributes.putAttribute(CONTEXT_ATTRIBUTE, null);
     executionAttributes.putAttribute(AWS_SDK_REQUEST_ATTRIBUTE, null);
   }
diff --git a/instrumentation/executors/javaagent/src/test/groovy/ExecutorInstrumentationTest.groovy b/instrumentation/executors/javaagent/src/test/groovy/ExecutorInstrumentationTest.groovy
index ad927ab5e72b..6f62ef1c92f8 100644
--- a/instrumentation/executors/javaagent/src/test/groovy/ExecutorInstrumentationTest.groovy
+++ b/instrumentation/executors/javaagent/src/test/groovy/ExecutorInstrumentationTest.groovy
@@ -13,6 +13,7 @@ import java.util.concurrent.ArrayBlockingQueue
 import java.util.concurrent.Callable
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ExecutionException
+import java.util.concurrent.ExecutorService
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
 import java.util.concurrent.Future
@@ -134,7 +135,7 @@ class ExecutorInstrumentationTest extends AgentInstrumentationSpecification {
 
   def "#poolImpl '#name' wrap lambdas"() {
     setup:
-    def pool = poolImpl
+    ExecutorService pool = poolImpl
     def m = method
     def w = wrap
 
@@ -160,7 +161,7 @@ class ExecutorInstrumentationTest extends AgentInstrumentationSpecification {
     }
 
     cleanup:
-    pool?.shutdown()
+    pool.shutdown()
 
     where:
     name                | method           | wrap                           | poolImpl
@@ -173,7 +174,7 @@ class ExecutorInstrumentationTest extends AgentInstrumentationSpecification {
 
   def "#poolImpl '#name' reports after canceled jobs"() {
     setup:
-    def pool = poolImpl
+    ExecutorService pool = poolImpl
     def m = method
     List<JavaAsyncChild> children = new ArrayList<>()
     List<Future> jobFutures = new ArrayList<>()
@@ -216,6 +217,11 @@ class ExecutorInstrumentationTest extends AgentInstrumentationSpecification {
     expect:
     waitForTraces(1).size() == 1
 
+    // Wait for shutdown since we didn't wait on task completion and want to confirm any pending
+    // ones clean up context.
+    pool.shutdown()
+    pool.awaitTermination(10, TimeUnit.SECONDS)
+
     where:
     name                | method           | poolImpl
     "submit Runnable"   | submitRunnable   | new ThreadPoolExecutor(1, 1, 1000, TimeUnit.NANOSECONDS, new ArrayBlockingQueue<Runnable>(1))
diff --git a/instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle b/instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle
index 5f79087b6633..5fba968521af 100644
--- a/instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle
+++ b/instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle
@@ -22,4 +22,9 @@ dependencies {
 
 tasks.withType(Test) {
   jvmArgs "-Dotel.instrumentation.grizzly.enabled=true"
+}
+
+tasks.withType(Test) {
+  // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/2640
+  jvmArgs "-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=false"
 }
\ No newline at end of file
diff --git a/instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle b/instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle
index e3c81f97df76..7f268f730bff 100644
--- a/instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle
+++ b/instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle
@@ -20,6 +20,7 @@ tasks.withType(Test) {
   jvmArgs "-Dotel.instrumentation.hystrix.experimental-span-attributes=true"
   // Disable so failure testing below doesn't inadvertently change the behavior.
   jvmArgs "-Dhystrix.command.default.circuitBreaker.enabled=false"
+  jvmArgs "-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=false"
 
   // Uncomment for debugging:
   // jvmArgs "-Dhystrix.command.default.execution.timeout.enabled=false"
diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle b/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle
index ac232a4aa091..5d7e35476462 100644
--- a/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle
+++ b/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle
@@ -18,5 +18,3 @@ dependencies {
 
   latestDepTestLibrary group: 'com.squareup.okhttp', name: 'okhttp', version: '[2.6,3)'
 }
-
-
diff --git a/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextStorage.java b/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextStorage.java
index 703b4d9a6b47..0f977a8332fc 100644
--- a/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextStorage.java
+++ b/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextStorage.java
@@ -31,7 +31,7 @@
  * always stores and retrieves them from the agent context, even when accessed from the application.
  * All other accesses are to the concrete application context.
  */
-public class AgentContextStorage implements ContextStorage {
+public class AgentContextStorage implements ContextStorage, AutoCloseable {
 
   private static final Logger logger = LoggerFactory.getLogger(AgentContextStorage.class);
 
@@ -145,6 +145,15 @@ public Context current() {
     return new AgentContextWrapper(io.opentelemetry.context.Context.current(), applicationContext);
   }
 
+  @Override
+  public void close() throws Exception {
+    io.opentelemetry.context.ContextStorage agentStorage =
+        io.opentelemetry.context.ContextStorage.get();
+    if (agentStorage instanceof AutoCloseable) {
+      ((AutoCloseable) agentStorage).close();
+    }
+  }
+
   public static class AgentContextWrapper implements Context {
     private final io.opentelemetry.context.Context agentContext;
     private final Context applicationContext;
diff --git a/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle b/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle
index e20b2e29dd71..73b74f530d59 100644
--- a/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle
+++ b/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle
@@ -20,3 +20,8 @@ dependencies {
     testImplementation group: 'com.sun.activation', name: 'jakarta.activation', version: '1.2.2'
   }
 }
+
+tasks.withType(Test) {
+  // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/2648
+  jvmArgs "-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=false"
+}
diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/ContextAndScope.java b/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/ContextAndScope.java
deleted file mode 100644
index aa67e1f4cde1..000000000000
--- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/ContextAndScope.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.instrumentation.rocketmq;
-
-import io.opentelemetry.context.Context;
-import io.opentelemetry.context.Scope;
-
-final class ContextAndScope {
-  private final Context context;
-  private final Scope scope;
-
-  public ContextAndScope(Context context, Scope scope) {
-    this.context = context;
-    this.scope = scope;
-  }
-
-  public Context getContext() {
-    return context;
-  }
-
-  public void closeScope() {
-    scope.close();
-  }
-}
diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingConsumeMessageHookImpl.java b/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingConsumeMessageHookImpl.java
index 11b0775a02cc..64ed0745b0db 100644
--- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingConsumeMessageHookImpl.java
+++ b/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingConsumeMessageHookImpl.java
@@ -27,9 +27,8 @@ public void consumeMessageBefore(ConsumeMessageContext context) {
     if (context == null || context.getMsgList() == null || context.getMsgList().isEmpty()) {
       return;
     }
-    Context traceContext = tracer.startSpan(Context.current(), context.getMsgList());
-    ContextAndScope contextAndScope = new ContextAndScope(traceContext, traceContext.makeCurrent());
-    context.setMqTraceContext(contextAndScope);
+    Context otelContext = tracer.startSpan(Context.current(), context.getMsgList());
+    context.setMqTraceContext(otelContext);
   }
 
   @Override
@@ -37,10 +36,9 @@ public void consumeMessageAfter(ConsumeMessageContext context) {
     if (context == null || context.getMsgList() == null || context.getMsgList().isEmpty()) {
       return;
     }
-    if (context.getMqTraceContext() instanceof ContextAndScope) {
-      ContextAndScope contextAndScope = (ContextAndScope) context.getMqTraceContext();
-      contextAndScope.closeScope();
-      tracer.end(contextAndScope.getContext());
+    if (context.getMqTraceContext() instanceof Context) {
+      Context otelContext = (Context) context.getMqTraceContext();
+      tracer.end(otelContext);
     }
   }
 }
diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingSendMessageHookImpl.java b/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingSendMessageHookImpl.java
index 8665c3c9f36a..85ab6deb9be1 100644
--- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingSendMessageHookImpl.java
+++ b/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/TracingSendMessageHookImpl.java
@@ -15,7 +15,7 @@
 final class TracingSendMessageHookImpl implements SendMessageHook {
 
   private final RocketMqProducerTracer tracer;
-  private boolean propagationEnabled;
+  private final boolean propagationEnabled;
 
   TracingSendMessageHookImpl(RocketMqProducerTracer tracer, boolean propagationEnabled) {
     this.tracer = tracer;
@@ -32,15 +32,14 @@ public void sendMessageBefore(SendMessageContext context) {
     if (context == null) {
       return;
     }
-    Context traceContext =
+    Context otelContext =
         tracer.startProducerSpan(Context.current(), context.getBrokerAddr(), context.getMessage());
     if (propagationEnabled) {
       GlobalOpenTelemetry.getPropagators()
           .getTextMapPropagator()
-          .inject(traceContext, context.getMessage().getProperties(), SETTER);
+          .inject(otelContext, context.getMessage().getProperties(), SETTER);
     }
-    ContextAndScope contextAndScope = new ContextAndScope(traceContext, traceContext.makeCurrent());
-    context.setMqTraceContext(contextAndScope);
+    context.setMqTraceContext(otelContext);
   }
 
   @Override
@@ -48,11 +47,10 @@ public void sendMessageAfter(SendMessageContext context) {
     if (context == null || context.getMqTraceContext() == null || context.getSendResult() == null) {
       return;
     }
-    if (context.getMqTraceContext() instanceof ContextAndScope) {
-      ContextAndScope contextAndScope = (ContextAndScope) context.getMqTraceContext();
-      tracer.afterProduce(contextAndScope.getContext(), context.getSendResult());
-      contextAndScope.closeScope();
-      tracer.end(contextAndScope.getContext());
+    if (context.getMqTraceContext() instanceof Context) {
+      Context otelContext = (Context) context.getMqTraceContext();
+      tracer.afterProduce(otelContext, context.getSendResult());
+      tracer.end(otelContext);
     }
   }
 }
diff --git a/instrumentation/scala-executors/javaagent/src/test/groovy/ScalaExecutorInstrumentationTest.groovy b/instrumentation/scala-executors/javaagent/src/test/groovy/ScalaExecutorInstrumentationTest.groovy
index be7243675721..1c8235ef4339 100644
--- a/instrumentation/scala-executors/javaagent/src/test/groovy/ScalaExecutorInstrumentationTest.groovy
+++ b/instrumentation/scala-executors/javaagent/src/test/groovy/ScalaExecutorInstrumentationTest.groovy
@@ -10,6 +10,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
 import java.lang.reflect.InvocationTargetException
 import java.util.concurrent.ArrayBlockingQueue
 import java.util.concurrent.Callable
+import java.util.concurrent.ExecutorService
 import java.util.concurrent.Future
 import java.util.concurrent.RejectedExecutionException
 import java.util.concurrent.ThreadPoolExecutor
@@ -87,7 +88,7 @@ class ScalaExecutorInstrumentationTest extends AgentInstrumentationSpecification
 
   def "#poolImpl '#name' reports after canceled jobs"() {
     setup:
-    def pool = poolImpl
+    ExecutorService pool = poolImpl
     def m = method
     List<ScalaAsyncChild> children = new ArrayList<>()
     List<Future> jobFutures = new ArrayList<>()
@@ -129,6 +130,11 @@ class ScalaExecutorInstrumentationTest extends AgentInstrumentationSpecification
     expect:
     waitForTraces(1).size() == 1
 
+    // Wait for shutdown to make sure any remaining tasks finish and cleanup context since we don't
+    // wait on the tasks.
+    pool.shutdown()
+    pool.awaitTermination(10, TimeUnit.SECONDS)
+
     where:
     name              | method         | poolImpl
     "submit Runnable" | submitRunnable | new ForkJoinPool()
diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle b/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle
index df3e71f68ef8..2f60345699d8 100644
--- a/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle
+++ b/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle
@@ -54,6 +54,11 @@ dependencies {
 tasks.withType(Test) {
   // TODO run tests both with and without experimental span attributes
   jvmArgs '-Dotel.instrumentation.spring-webflux.experimental-span-attributes=true'
+  // TODO(anuraaga): There is no actual context leak - it just seems that the server-side does not
+  // fully complete processing before the test cases finish, which is when we check for context
+  // leaks. Adding Thread.sleep(1000) just before checking for leaks allows it to pass but is not
+  // a good approach. Come up with a better one and enable this.
+  jvmArgs "-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=false"
 
   systemProperty "testLatestDeps", testLatestDeps
 }
diff --git a/javaagent-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/concurrent/ExecutorInstrumentationUtils.java b/javaagent-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/concurrent/ExecutorInstrumentationUtils.java
index 4aac417704de..9590ce8e723f 100644
--- a/javaagent-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/concurrent/ExecutorInstrumentationUtils.java
+++ b/javaagent-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/concurrent/ExecutorInstrumentationUtils.java
@@ -14,6 +14,43 @@
 /** Utils for concurrent instrumentations. */
 public class ExecutorInstrumentationUtils {
 
+  private static final ClassValue<Boolean> NOT_INSTRUMENTED_RUNNABLE_ENCLOSING_CLASS =
+      new ClassValue<Boolean>() {
+        @Override
+        protected Boolean computeValue(Class<?> enclosingClass) {
+          // Avoid context leak on jetty. Runnable submitted from SelectChannelEndPoint is used to
+          // process a new request which should not have context from them current request.
+          if (enclosingClass.getName().equals("org.eclipse.jetty.io.nio.SelectChannelEndPoint")) {
+            return true;
+          }
+
+          // Don't instrument the executor's own runnables. These runnables may never return until
+          // netty shuts down.
+          if (enclosingClass
+              .getName()
+              .equals("io.netty.util.concurrent.SingleThreadEventExecutor")) {
+            return true;
+          }
+
+          // OkHttp task runner is a lazily-initialized shared pool of continuosly running threads
+          // similar to an event loop. The submitted tasks themselves should already be instrumented
+          // to
+          // allow async propagation.
+          if (enclosingClass.getName().equals("okhttp3.internal.concurrent.TaskRunner")) {
+            return true;
+          }
+
+          // OkHttp connection pool lazily initializes a long running task to detect expired
+          // connections
+          // and should not itself be instrumented.
+          if (enclosingClass.getName().equals("com.squareup.okhttp.ConnectionPool")) {
+            return true;
+          }
+
+          return false;
+        }
+      };
+
   /**
    * Checks if given task should get state attached.
    *
@@ -28,22 +65,37 @@ public static boolean shouldAttachStateToTask(Object task) {
     Class<?> taskClass = task.getClass();
     Class<?> enclosingClass = taskClass.getEnclosingClass();
 
-    // not much point in propagating root context
-    // plus it causes failures under otel.javaagent.testing.fail-on-context-leak=true
-    return Context.current() != Context.root()
-        // TODO Workaround for
-        // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/787
-        && !taskClass.getName().equals("org.apache.tomcat.util.net.NioEndpoint$SocketProcessor")
-        // Avoid context leak on jetty. Runnable submitted from SelectChannelEndPoint is used to
-        // process a new request which should not have context from them current request.
-        && (enclosingClass == null
-            || !enclosingClass.getName().equals("org.eclipse.jetty.io.nio.SelectChannelEndPoint"))
-        // Don't instrument the executor's own runnables. These runnables may never return until
-        // netty shuts down.
-        && (enclosingClass == null
-            || !enclosingClass
-                .getName()
-                .equals("io.netty.util.concurrent.SingleThreadEventExecutor"));
+    if (Context.current() == Context.root()) {
+      // not much point in propagating root context
+      // plus it causes failures under otel.javaagent.testing.fail-on-context-leak=true
+      return false;
+    }
+
+    // ForkJoinPool threads are initialized lazily and continue to handle tasks similar to an event
+    // loop. They should not have context propagated to the base of the thread, tasks themselves
+    // will have it through other means.
+    if (taskClass.getName().equals("java.util.concurrent.ForkJoinWorkerThread")) {
+      return false;
+    }
+
+    // ThreadPoolExecutor worker threads may be initialized lazily and manage interruption of other
+    // threads. The actual tasks being run on those threads will propagate context but we should not
+    // propagate onto this management thread.
+    if (taskClass.getName().equals("java.util.concurrent.ThreadPoolExecutor$Worker")) {
+      return false;
+    }
+
+    // TODO Workaround for
+    // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/787
+    if (taskClass.getName().equals("org.apache.tomcat.util.net.NioEndpoint$SocketProcessor")) {
+      return false;
+    }
+
+    if (enclosingClass != null && NOT_INSTRUMENTED_RUNNABLE_ENCLOSING_CLASS.get(enclosingClass)) {
+      return false;
+    }
+
+    return true;
   }
 
   /**
diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/InstrumentationSpecification.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/InstrumentationSpecification.groovy
index aa9e08d0418a..4d0fb870685b 100644
--- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/InstrumentationSpecification.groovy
+++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/InstrumentationSpecification.groovy
@@ -9,6 +9,7 @@ import groovy.transform.stc.ClosureParams
 import groovy.transform.stc.SimpleType
 import io.opentelemetry.api.OpenTelemetry
 import io.opentelemetry.api.trace.Span
+import io.opentelemetry.context.ContextStorage
 import io.opentelemetry.instrumentation.test.asserts.InMemoryExporterAssert
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner
 import io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil
@@ -36,6 +37,13 @@ abstract class InstrumentationSpecification extends Specification {
     testRunner().clearAllExportedData()
   }
 
+  def cleanup() {
+    ContextStorage storage = ContextStorage.get()
+    if (storage instanceof AutoCloseable) {
+      ((AutoCloseable) storage).close()
+    }
+  }
+
   def cleanupSpec() {
     testRunner().afterTestClass()
   }
diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/InstrumentationExtension.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/InstrumentationExtension.java
index d819d9fbcb30..2dd0af82c2d3 100644
--- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/InstrumentationExtension.java
+++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/InstrumentationExtension.java
@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.testing.junit;
 
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.context.ContextStorage;
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;
 import io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil;
 import io.opentelemetry.sdk.metrics.data.MetricData;
@@ -14,12 +15,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
 public abstract class InstrumentationExtension
-    implements BeforeAllCallback, BeforeEachCallback, AfterAllCallback {
+    implements BeforeAllCallback, BeforeEachCallback, AfterAllCallback, AfterEachCallback {
   private static final long DEFAULT_TRACE_WAIT_TIMEOUT_SECONDS = 20;
 
   private final InstrumentationTestRunner testRunner;
@@ -38,6 +40,14 @@ public void beforeEach(ExtensionContext extensionContext) {
     testRunner.clearAllExportedData();
   }
 
+  @Override
+  public void afterEach(ExtensionContext context) throws Exception {
+    ContextStorage storage = ContextStorage.get();
+    if (storage instanceof AutoCloseable) {
+      ((AutoCloseable) storage).close();
+    }
+  }
+
   @Override
   public void afterAll(ExtensionContext extensionContext) {
     testRunner.afterTestClass();