diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
index 398b48b..1a6ef68 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
@@ -24,9 +24,9 @@
         ":JacocoCoverageLib",
         ":bitfield",
         "//third_party:guava",
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
-        "//third_party/java/jacoco:core-0.8.3",
-        "//third_party/java/jacoco:report-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
+        "//third_party/java/jacoco:core-0.8.6",
+        "//third_party/java/jacoco:report-0.8.6",
     ],
 )
 
@@ -45,9 +45,9 @@
     deps = [
         ":bitfield",
         "//third_party:guava",
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
-        "//third_party/java/jacoco:core-0.8.3",
-        "//third_party/java/jacoco:report-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
+        "//third_party/java/jacoco:core-0.8.6",
+        "//third_party/java/jacoco:report-0.8.6",
     ],
 )
 
diff --git a/src/java_tools/junitrunner/javatests/com/google/testing/coverage/BUILD b/src/java_tools/junitrunner/javatests/com/google/testing/coverage/BUILD
index 1f079d0..21f38cc 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/coverage/BUILD
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/coverage/BUILD
@@ -22,7 +22,7 @@
         "//third_party:junit4",
         "//third_party:mockito",
         "//third_party:truth",
-        "//third_party/java/jacoco:core-0.8.3",
-        "//third_party/java/jacoco:report-0.8.3",
+        "//third_party/java/jacoco:core-0.8.6",
+        "//third_party/java/jacoco:report-0.8.6",
     ],
 )
diff --git a/src/test/java/com/google/devtools/build/android/desugar/BUILD b/src/test/java/com/google/devtools/build/android/desugar/BUILD
index 5364c7c..ba33203 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/BUILD
@@ -323,7 +323,7 @@
     jvm_flags = [
         # TODO (b/72181101): -Xbootclasspath/p is removed in JDK 9.
         "-XX:+IgnoreUnrecognizedVMOptions",
-        "-Xbootclasspath/a:$(location :testdata_desugared_core_library):$(location //third_party/java/jacoco:blaze-agent-0.8.3)",
+        "-Xbootclasspath/a:$(location :testdata_desugared_core_library):$(location //third_party/java/jacoco:blaze-agent-0.8.6)",
         "--patch-module=java.base=$(location :testdata_desugared_core_library)",
     ],
     tags = ["no_windows"],
@@ -335,7 +335,7 @@
         "//third_party:truth",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
     ],
 )
 
@@ -345,7 +345,7 @@
     srcs = [
         "StackMapBugTest.java",
     ],
-    jvm_flags = ["-Xbootclasspath/a:$(location //third_party/java/jacoco:blaze-agent-0.8.3)"],
+    jvm_flags = ["-Xbootclasspath/a:$(location //third_party/java/jacoco:blaze-agent-0.8.6)"],
     tags = ["no_windows"],
     deps = [
         ":testdata_desugared_core_library",  # Make tests run against desugared library
@@ -354,7 +354,7 @@
         "//third_party:truth",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
     ],
 )
 
@@ -370,7 +370,7 @@
     ],
     jvm_flags = [
         "-DDefaultMethodClassFixerTest.bootclasspath=$(location :android_jar_for_testing)",
-        "-DDefaultMethodClassFixerTest.classpath=$(location :separate):$(location //third_party:guava-jars):$(location //third_party/java/jacoco:blaze-agent-0.8.3)",
+        "-DDefaultMethodClassFixerTest.classpath=$(location :separate):$(location //third_party:guava-jars):$(location //third_party/java/jacoco:blaze-agent-0.8.6)",
         "-DDefaultMethodClassFixerTest.input=$(location :testdata_java8)",
     ],
     tags = ["no_windows"],
@@ -383,7 +383,7 @@
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
     ],
 )
 
@@ -809,7 +809,7 @@
         ":testdata",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared.jar"],
@@ -817,7 +817,7 @@
           "--nodesugar_interface_method_bodies_if_needed -i $(location :testdata) -o $@ " +
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -838,13 +838,13 @@
     srcs = [
         ":generate_lambda_with_constant_arguments_in_test_data",
         # Depend on Jacoco runtime in case testdata was built with coverage instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugar_generate_lambda_with_constant_arguments.jar"],
     cmd = "$(location //src/tools/android/java/com/google/devtools/build/android/desugar:Desugar) " +
           "-i $(location :generate_lambda_with_constant_arguments_in_test_data) -o $@ " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -877,7 +877,7 @@
         ":separate",
         ":generate_synthetic_methods_with_lambda_names_in_test_data",
         # Depend on Jacoco runtime in case testdata was built with coverage instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_with_synthetic_methods_with_lambda_names.jar"],
@@ -885,7 +885,7 @@
           "--nodesugar_interface_method_bodies_if_needed -i $(location :generate_synthetic_methods_with_lambda_names_in_test_data) -o $@ " +
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -899,7 +899,7 @@
         ":testdata_desugared.jar",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_twice.jar"],
@@ -907,7 +907,7 @@
           "--nodesugar_interface_method_bodies_if_needed -i $(location :testdata_desugared.jar) -o $@ " +
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -924,7 +924,7 @@
         ":testdata",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_without_lambda_desugared.jar"],
@@ -933,7 +933,7 @@
           "--nodesugar_try_with_resources_if_needed " +
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar) " +
           "--only_desugar_javac9_for_lint",
     tags = ["no_windows"],
@@ -1094,7 +1094,7 @@
         ":testdata_java8",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_java8.jar"],
@@ -1104,7 +1104,7 @@
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location :separate_java8) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1119,7 +1119,7 @@
         ":testdata_java8_like_in_android_studio",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_java8_like_in_android_studio.jar"],
@@ -1131,7 +1131,7 @@
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location :separate_java8) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1146,7 +1146,7 @@
         ":testdata_java8",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_default_methods.jar"],
@@ -1156,7 +1156,7 @@
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location :separate_java8) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1168,14 +1168,14 @@
         ":separate_java8",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["separate_java8_desugared_default_methods.jar"],
     cmd = "$(location //src/tools/android/java/com/google/devtools/build/android/desugar:Desugar) " +
           "-i $(location :separate_java8) -o $@ " +
           "--emit_dependency_metadata_as_needed " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1190,7 +1190,7 @@
         ":testdata_java8",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_default_methods.output.txt"],
@@ -1200,7 +1200,7 @@
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location :separate_java8) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar) " +
           " &> $@",
     tags = ["no_windows"],
@@ -1216,7 +1216,7 @@
         ":testdata_desugared_default_methods.jar",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_default_methods_twice.jar"],
@@ -1225,7 +1225,7 @@
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location :separate_java8) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1237,13 +1237,13 @@
         ":testdata_core_library",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_core_library.jar"],
     cmd = "$(location //src/tools/android/java/com/google/devtools/build/android/desugar:Desugar) " +
           "--core_library -i $(location :testdata_core_library) -o $@ " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1257,7 +1257,7 @@
         ":testdata_like_in_android_studio",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_like_in_android_studio.jar"],
@@ -1269,7 +1269,7 @@
           "--copy_bridges_from_classpath " +
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1283,7 +1283,7 @@
         ":testdata_like_in_android_studio",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = [
@@ -1297,7 +1297,7 @@
           "--copy_bridges_from_classpath " +
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1311,7 +1311,7 @@
         ":testdata_like_in_android_studio",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = [
@@ -1328,7 +1328,7 @@
           --copy_bridges_from_classpath \
           --classpath_entry $(location :separate) \
           --classpath_entry $(location //third_party:guava-jars) \
-          --classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) \
+          --classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) \
           --bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)
      rm -rf $$tmpdir
     """,
@@ -1347,7 +1347,7 @@
         ":testdata_like_in_android_studio",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = [
@@ -1365,7 +1365,7 @@
           --copy_bridges_from_classpath \
           --classpath_entry $(location :separate) \
           --classpath_entry $(location //third_party:guava-jars) \
-          --classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) \
+          --classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) \
           --bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)
      pushd $$tmpdirOut
      $$pwddir/$(location //tools/zip:zipper) c $$pwddir/$(location testdata_desugared_from_directory_to_directory.jar) $$(find *)
@@ -1388,7 +1388,7 @@
         ":testdata_like_in_android_studio",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = [
@@ -1405,7 +1405,7 @@
           --copy_bridges_from_classpath \
           --classpath_entry $$tmpdir \
           --classpath_entry $(location //third_party:guava-jars) \
-          --classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) \
+          --classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) \
           --bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)
      rm -rf $$tmpdir
     """,
@@ -1426,7 +1426,7 @@
         ":testdata",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_for_try_with_resources.jar"],
@@ -1435,7 +1435,7 @@
           "--min_sdk_version 17 --desugar_try_with_resources_if_needed " +
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1448,7 +1448,7 @@
     name = "desugar_default_method_with_legacy_coverage",
     srcs = [
         "jacoco_0_7_5_default_method.jar",
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["jacoco_0_7_5_default_method_desugared.jar"],
@@ -1457,7 +1457,7 @@
           "--legacy_jacoco_fix " +
           "--min_sdk_version 19 " +
           "-i $(location :jacoco_0_7_5_default_method.jar) -o $@ " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1472,7 +1472,7 @@
         ":testdata",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_for_NO_desugaring_try_with_resources.jar"],
@@ -1481,7 +1481,7 @@
           "--min_sdk_version 19 --desugar_try_with_resources_if_needed " +
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1495,7 +1495,7 @@
         ":desugar_testdata_by_desugaring_try_with_resources",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_for_try_with_resources_twice.jar"],
@@ -1504,7 +1504,7 @@
           "--min_sdk_version 17 --desugar_try_with_resources_if_needed " +
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1803,13 +1803,13 @@
         ":capture_lambda",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["capture_lambda_desugared.jar"],
     cmd = "$(location //src/tools/android/java/com/google/devtools/build/android/desugar:Desugar) " +
           "-i $(location :capture_lambda) -o $@ " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1821,13 +1821,13 @@
         ":capture_lambda_desugared.jar",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["capture_lambda_desugared_twice.jar"],
     cmd = "$(location //src/tools/android/java/com/google/devtools/build/android/desugar:Desugar) " +
           "-i $(location :capture_lambda_desugared.jar) -o $@ " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tags = ["no_windows"],
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
@@ -1989,7 +1989,7 @@
         ":separate",
         ":testdata_java8",
         "//third_party:guava-jars",
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["testdata_desugared_with_missing_dep.jar"],
@@ -1998,7 +1998,7 @@
           "--emit_dependency_metadata_as_needed " +
           "--classpath_entry $(location :separate) " +
           "--classpath_entry $(location //third_party:guava-jars) " +
-          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.3) " +
+          "--classpath_entry $(location //third_party/java/jacoco:blaze-agent-0.8.6) " +
           "--bootclasspath_entry $(location @bazel_tools//tools/android:android_jar)",
     tools = ["//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar"],
 )
@@ -2008,7 +2008,7 @@
     srcs = [
         ":b68049457_caller",
         ":b68049457_interface",
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["b68049457_caller_desugared.jar"],
@@ -2077,7 +2077,7 @@
         "//third_party:guava-jars",
         # Depend on Jacoco runtime in case testdata was built with coverage
         # instrumentation
-        "//third_party/java/jacoco:blaze-agent-0.8.3",
+        "//third_party/java/jacoco:blaze-agent-0.8.6",
         "@bazel_tools//tools/android:android_jar",
     ],
     outs = ["guava_at_head_desugared.jar"],
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 06fbba4..5a49033 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -508,11 +508,7 @@
             "//src/test/shell/bazel/testdata:jdk_http_archives_filegroup",
             "//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:coverage_output_generator_repo",
         ],
-        # TODO(#11674) reenable after the upgrade
-        tags = [
-            "manual",
-            "no_windows",
-        ],
+        tags = ["no_windows"],
     )
     for java_version in JAVA_VERSIONS
 ]
diff --git a/src/test/shell/bazel/bazel_java_tools_dist_test.sh b/src/test/shell/bazel/bazel_java_tools_dist_test.sh
index 53f3885..b972764 100755
--- a/src/test/shell/bazel/bazel_java_tools_dist_test.sh
+++ b/src/test/shell/bazel/bazel_java_tools_dist_test.sh
@@ -138,14 +138,13 @@
   expect_path_in_java_tools "javac-9+181-r4173-1.srcjar"
 }
 
-# TODO(#11674) reenable after the upgrade
-function disable_test_java_tools_has_jacocoagent() {
-  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.agent-0.8.3-sources.jar"
-  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.core-0.8.3-sources.jar"
-  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.report-0.8.3-sources.jar"
-  expect_path_in_java_tools "third_party/asm/asm-analysis-8.0-sources.jar"
-  expect_path_in_java_tools "third_party/asm/asm-commons-8.0-sources.jar"
-  expect_path_in_java_tools "third_party/asm/asm-8.0-sources.jar"
+function test_java_tools_has_jacocoagent() {
+  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.agent-0.8.6-sources.jar"
+  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.core-0.8.6-sources.jar"
+  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.report-0.8.6-sources.jar"
+  expect_path_in_java_tools "third_party/asm/asm-analysis-9.1-sources.jar"
+  expect_path_in_java_tools "third_party/asm/asm-commons-9.1-sources.jar"
+  expect_path_in_java_tools "third_party/asm/asm-9.1-sources.jar"
 }
 
 function test_java_tools_has_proguard() {
diff --git a/src/test/shell/bazel/bazel_java_tools_test.sh b/src/test/shell/bazel/bazel_java_tools_test.sh
index a2b2bd9..9c330df 100755
--- a/src/test/shell/bazel/bazel_java_tools_test.sh
+++ b/src/test/shell/bazel/bazel_java_tools_test.sh
@@ -176,15 +176,14 @@
   expect_path_in_java_tools "BUILD"
 }
 
-# TODO(#11674) reenable after the upgrade
-function disable_test_java_tools_has_jacocoagent() {
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/jacocoagent-0.8.3.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.3.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.3.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.report-0.8.3.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-tree-8.0.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-commons-8.0.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-8.0.jar"
+function test_java_tools_has_jacocoagent() {
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/jacocoagent-0.8.6.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.6.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.6.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.report-0.8.6.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-tree-9.1.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-commons-9.1.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-9.1.jar"
   expect_path_in_java_tools "java_tools/third_party/java/jacoco/LICENSE"
 }
 
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit/BUILD b/src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
index e7b41751..bb464b9 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit/BUILD
@@ -37,10 +37,10 @@
 
 genrule(
     name = "jacoco_agent_jar",
-    srcs = ["//third_party/java/jacoco:blaze-agent-0.8.3"],
+    srcs = ["//third_party/java/jacoco:blaze-agent-0.8.6"],
     outs = ["jacoco_agent.jar"],
     cmd = """
-        cp $(location //third_party/java/jacoco:blaze-agent-0.8.3) $(OUTS)
+        cp $(location //third_party/java/jacoco:blaze-agent-0.8.6) $(OUTS)
     """,
 )
 
diff --git a/tools/distributions/debian/debian_java.BUILD b/tools/distributions/debian/debian_java.BUILD
index 92d863f..8a6eb29 100644
--- a/tools/distributions/debian/debian_java.BUILD
+++ b/tools/distributions/debian/debian_java.BUILD
@@ -230,7 +230,7 @@
 )
 
 # libjacoco-java - BEGIN
-JACOCOVERSION = "0.8.3"
+JACOCOVERSION = "0.8.6"
 java_import(
     name = "agent",
     jars = ["org.jacoco.agent.jar"],
diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools
index 5c25858..3a7d841 100644
--- a/tools/jdk/BUILD.java_tools
+++ b/tools/jdk/BUILD.java_tools
@@ -77,14 +77,14 @@
 
 java_import(
     name = "jacoco-agent",
-    jars = ["java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.3.jar"],
-    srcjar = "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.3-src.jar",
+    jars = ["java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.6.jar"],
+    srcjar = "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.6-src.jar",
 )
 
 java_import(
     name = "jacoco-core",
-    jars = ["java_tools/third_party/java/jacoco/org.jacoco.core-0.8.3.jar"],
-    srcjar = "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.3-src.jar",
+    jars = ["java_tools/third_party/java/jacoco/org.jacoco.core-0.8.6.jar"],
+    srcjar = "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.6-src.jar",
     exports = [
         ":asm",
         ":asm-commons",
@@ -94,12 +94,12 @@
 
 filegroup(
     name = "jacoco-core-jars",
-    srcs = ["java_tools/third_party/java/jacoco/org.jacoco.core-0.8.3.jar"],
+    srcs = ["java_tools/third_party/java/jacoco/org.jacoco.core-0.8.6.jar"],
 )
 
 java_import(
     name = "jacoco-report",
-    jars = ["java_tools/third_party/java/jacoco/org.jacoco.report-0.8.3.jar"],
+    jars = ["java_tools/third_party/java/jacoco/org.jacoco.report-0.8.6.jar"],
     srcjar = "java_tools/third_party/java/jacoco/org.jacoco.report-sources.jar",
     exports = [
         ":asm",
@@ -109,32 +109,32 @@
 
 java_import(
     name = "bazel-jacoco-agent",
-    jars = ["java_tools/third_party/java/jacoco/jacocoagent-0.8.3.jar"],
+    jars = ["java_tools/third_party/java/jacoco/jacocoagent-0.8.6.jar"],
 )
 
 java_import(
     name = "bazel-jacoco-agent-neverlink",
-    jars = ["java_tools/third_party/java/jacoco/jacocoagent-0.8.3.jar"],
+    jars = ["java_tools/third_party/java/jacoco/jacocoagent-0.8.6.jar"],
     neverlink = 1,
 )
 
 java_import(
     name = "asm",
-    jars = ["java_tools/third_party/java/jacoco/asm-8.0.jar"],
-    srcjar = "java_tools/third_party/java/jacoco/asm-8.0-sources.jar",
+    jars = ["java_tools/third_party/java/jacoco/asm-9.1.jar"],
+    srcjar = "java_tools/third_party/java/jacoco/asm-9.1-sources.jar",
 )
 
 java_import(
     name = "asm-commons",
-    jars = ["java_tools/third_party/java/jacoco/asm-commons-8.0.jar"],
-    srcjar = "java_tools/third_party/java/jacoco/asm-commons-8.0-sources.jar",
+    jars = ["java_tools/third_party/java/jacoco/asm-commons-9.1.jar"],
+    srcjar = "java_tools/third_party/java/jacoco/asm-commons-9.1-sources.jar",
     runtime_deps = [":asm-tree"],
 )
 
 java_import(
     name = "asm-tree",
-    jars = ["java_tools/third_party/java/jacoco/asm-tree-8.0.jar"],
-    srcjar = "java_tools/third_party/java/jacoco/asm-tree-8.0-sources.jar",
+    jars = ["java_tools/third_party/java/jacoco/asm-tree-9.1.jar"],
+    srcjar = "java_tools/third_party/java/jacoco/asm-tree-9.1-sources.jar",
     runtime_deps = [":asm"],
 )