diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextInjector.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextInjector.java
index 370e99516c6..45e717ad49b 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextInjector.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextInjector.java
@@ -105,7 +105,7 @@ public ClassVisitor wrap(
       final MethodList<?> methods,
       final int writerFlags,
       final int readerFlags) {
-    return new ClassVisitor(Opcodes.ASM7, classVisitor) {
+    return new ClassVisitor(Opcodes.ASM8, classVisitor) {
 
       private final boolean frames =
           implementationContext.getClassFileVersion().isAtLeast(ClassFileVersion.JAVA_V6);
@@ -509,7 +509,7 @@ static BitSet getInjectedContextStores() {
   private static final class SerialVersionUIDInjector
       extends datadog.trace.agent.tooling.context.asm.SerialVersionUIDAdder {
     public SerialVersionUIDInjector() {
-      super(Opcodes.ASM7, null);
+      super(Opcodes.ASM8, null);
     }
 
     public void injectSerialVersionUID(
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextRequestRewriter.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextRequestRewriter.java
index f56c091fac2..fb0a6153a41 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextRequestRewriter.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextRequestRewriter.java
@@ -84,7 +84,7 @@ public ClassVisitor wrap(
       final MethodList<?> methods,
       final int writerFlags,
       final int readerFlags) {
-    return new ClassVisitor(Opcodes.ASM7, classVisitor) {
+    return new ClassVisitor(Opcodes.ASM8, classVisitor) {
       @Override
       public MethodVisitor visitMethod(
           final int access,
@@ -93,7 +93,7 @@ public MethodVisitor visitMethod(
           final String signature,
           final String[] exceptions) {
         final MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
-        return new MethodVisitor(Opcodes.ASM7, mv) {
+        return new MethodVisitor(api, mv) {
           /** The last two constants pushed onto the stack. */
           private Object constant1, constant2;