diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/datadog/trace/instrumentation/maven3/AbstractMavenTest.java b/dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java
similarity index 92%
rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/datadog/trace/instrumentation/maven3/AbstractMavenTest.java
rename to dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java
index 9ec8a47d8ad..5dc7a261d2c 100644
--- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/datadog/trace/instrumentation/maven3/AbstractMavenTest.java
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java
@@ -20,8 +20,7 @@ public abstract class AbstractMavenTest {
 
   protected AbstractMavenTest() {
     System.setProperty(
-        "maven.multiModuleProjectDirectory",
-        WORKING_DIRECTORY.getRoot().toAbsolutePath().toString());
+        "maven.multiModuleProjectDirectory", WORKING_DIRECTORY.toAbsolutePath().toString());
   }
 
   protected void executeMaven(
@@ -58,8 +57,7 @@ protected void customizeContainer(PlexusContainer container) {
     arguments[2] = goal;
     System.arraycopy(additionalArgs, 0, arguments, 3, additionalArgs.length);
 
-    mavenCli.doMain(
-        arguments, WORKING_DIRECTORY.getRoot().toAbsolutePath().toString(), stdOut, stderr);
+    mavenCli.doMain(arguments, WORKING_DIRECTORY.toAbsolutePath().toString(), stdOut, stderr);
 
     Exception error = spy.handlerError.get();
     if (error != null) {
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java b/dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java
similarity index 68%
rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java
rename to dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java
index 9359f822402..89811dabb1f 100644
--- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java
@@ -1,6 +1,6 @@
 package datadog.trace.instrumentation.maven3;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -12,54 +12,42 @@
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
+import java.util.stream.Stream;
 import org.apache.maven.execution.ExecutionEvent;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.project.MavenProject;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@RunWith(Parameterized.class)
 public class MavenProjectConfiguratorTest extends AbstractMavenTest {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(MavenProjectConfiguratorTest.class);
 
-  @Parameterized.Parameters(name = "{0} - {1}")
-  public static Collection<Object[]> surefireVersions() {
-    return Arrays.asList(
-        new Object[][] {
-          {"sampleProject/pom.xml", "test", new String[] {"-X", "-DargLine=-DmyArgLineProp=true"}},
-          {
+  public static Stream<Arguments> surefireVersions() {
+    return Stream.of(
+        Arguments.of(
+            "sampleProject/pom.xml", "test", new String[] {"-X", "-DargLine=-DmyArgLineProp=true"}),
+        Arguments.of(
             "sampleProject/pom.xml",
             "surefire:test",
-            new String[] {"-X", "-DargLine=-DmyArgLineProp=true"}
-          },
-          {"sampleProjectArgLine/pom.xml", "test", new String[] {"-X"}},
-          {"sampleProjectArgLine/pom.xml", "surefire:test", new String[] {"-X"}},
-          {"sampleProjectSurefireArgLine/pom.xml", "test", new String[] {"-X"}},
-          {"sampleProjectSurefireArgLine/pom.xml", "surefire:test", new String[] {"-X"}},
-          {"sampleProjectSurefireLateProcessingArgLine/pom.xml", "test", new String[] {"-X"}},
-        });
+            new String[] {"-X", "-DargLine=-DmyArgLineProp=true"}),
+        Arguments.of("sampleProjectArgLine/pom.xml", "test", new String[] {"-X"}),
+        Arguments.of("sampleProjectArgLine/pom.xml", "surefire:test", new String[] {"-X"}),
+        Arguments.of("sampleProjectSurefireArgLine/pom.xml", "test", new String[] {"-X"}),
+        Arguments.of("sampleProjectSurefireArgLine/pom.xml", "surefire:test", new String[] {"-X"}),
+        Arguments.of(
+            "sampleProjectSurefireLateProcessingArgLine/pom.xml", "test", new String[] {"-X"}));
   }
 
-  private final String pomPath;
-  private final String goal;
-  private final String[] additionalCmdLineArgs;
-
-  public MavenProjectConfiguratorTest(String pomPath, String goal, String[] additionalCmdLineArgs) {
-    this.pomPath = pomPath;
-    this.goal = goal;
-    this.additionalCmdLineArgs = additionalCmdLineArgs;
-  }
-
-  @Test
-  public void testTracerInjection() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testTracerInjection(String pomPath, String goal, String[] additionalCmdLineArgs)
+      throws Exception {
     ByteArrayOutputStream stdOutBaos = new ByteArrayOutputStream();
     PrintStream buildOutput = new PrintStream(stdOutBaos);
 
@@ -85,8 +73,8 @@ public void testTracerInjection() throws Exception {
                 && buildOutputLine.contains("-DmyArgLineProp=true");
       }
 
-      assertTrue("Tracer wasn't injected", javaAgentInjected);
-      assertTrue("Original argLine was not preserved", argLinePreserved);
+      assertTrue(javaAgentInjected, "Tracer wasn't injected");
+      assertTrue(argLinePreserved, "Original argLine was not preserved");
 
     } catch (Exception | Error e) {
       LOGGER.info("Build output:\n\n" + stdOutBaos);
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/datadog/trace/instrumentation/maven3/MavenUtilsTest.java b/dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java
similarity index 72%
rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/datadog/trace/instrumentation/maven3/MavenUtilsTest.java
rename to dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java
index d3865a25a8d..fdf39a29966 100644
--- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/datadog/trace/instrumentation/maven3/MavenUtilsTest.java
+++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java
@@ -18,11 +18,10 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import okhttp3.OkHttpClient;
@@ -34,16 +33,15 @@
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.PlexusContainer;
-import org.junit.Assume;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
-@RunWith(Parameterized.class)
 public class MavenUtilsTest extends AbstractMavenTest {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(MavenUtilsTest.class);
@@ -62,22 +60,29 @@ public class MavenUtilsTest extends AbstractMavenTest {
   private static final ComparableVersion SUREFIRE_3_2_0 = new ComparableVersion("3.2.0");
   private static final ComparableVersion MAVEN_3_3_1 = new ComparableVersion("3.3.1");
 
-  private final ComparableVersion surefirePluginVersion;
-
-  public MavenUtilsTest(
-      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion) {
-    Assume.assumeTrue(
-        "Newer maven version required to run chosen version of Surefire plugin",
-        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0);
-    this.surefirePluginVersion = surefirePluginVersion;
+  public static Stream<Arguments> surefireVersions() {
+    return Stream.of(
+        Arguments.of(new ComparableVersion("2.17"), new ComparableVersion("3.0.0")),
+        Arguments.of(new ComparableVersion("2.21.0"), new ComparableVersion("3.0.0")),
+        Arguments.of(new ComparableVersion("3.0.0"), new ComparableVersion("3.0.0")),
+        Arguments.of(new ComparableVersion("3.5.0"), new ComparableVersion("3.6.3")),
+        Arguments.of(
+            new ComparableVersion(getLatestMavenSurefireVersion()),
+            new ComparableVersion("3.6.3")));
   }
 
   private ComparableVersion getCurrentMavenVersion() {
     return new ComparableVersion(MavenSession.class.getPackage().getImplementationVersion());
   }
 
-  @Test
-  public void testGetMojoConfigValueReturnsNullIfValueNotSet() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetMojoConfigValueReturnsNullIfValueNotSet(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
     executeMaven(
         this::assertGetMojoConfigValueReturnsNullIfValueNotSet,
         "samplePom.xml",
@@ -96,8 +101,14 @@ private boolean assertGetMojoConfigValueReturnsNullIfValueNotSet(ExecutionEvent
     return true;
   }
 
-  @Test
-  public void testGetMojoConfigValueReturnsConfiguredValue() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetMojoConfigValueReturnsConfiguredValue(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
     executeMaven(
         this::assertGetMojoConfigValueReturnsConfiguredValue,
         "samplePom.xml",
@@ -116,8 +127,14 @@ private boolean assertGetMojoConfigValueReturnsConfiguredValue(ExecutionEvent ex
     return true;
   }
 
-  @Test
-  public void testGetMojoConfigValueResolvesPropertyPlaceholders() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetMojoConfigValueResolvesPropertyPlaceholders(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
     executeMaven(
         this::assertGetMojoConfigValueResolvesPropertyPlaceholders,
         "samplePom.xml",
@@ -138,8 +155,14 @@ private boolean assertGetMojoConfigValueResolvesPropertyPlaceholders(
     return true;
   }
 
-  @Test
-  public void testGetMojoConfigValueResolvesPropertiesSuppliedViaCmdLine() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetMojoConfigValueResolvesPropertiesSuppliedViaCmdLine(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
     executeMaven(
         this::assertGetMojoConfigValueResolvesPropertiesSuppliedViaCmdLine,
         "samplePom.xml",
@@ -161,8 +184,14 @@ private boolean assertGetMojoConfigValueResolvesPropertiesSuppliedViaCmdLine(
     return true;
   }
 
-  @Test
-  public void testGetArgLineResolvesLatePropertyPlaceholders() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetArgLineResolvesLatePropertyPlaceholders(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
     executeMaven(
         this::assertGetArgLineResolvesLatePropertyPlaceholders,
         "samplePom.xml",
@@ -182,8 +211,14 @@ private boolean assertGetArgLineResolvesLatePropertyPlaceholders(ExecutionEvent
     return true;
   }
 
-  @Test
-  public void testGetJacocoAgent() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetJacocoAgent(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
     executeMaven(this::assertGetJacocoAgent, "samplePomJacoco.xml", "test");
   }
 
@@ -201,8 +236,14 @@ private boolean assertGetJacocoAgent(ExecutionEvent executionEvent) {
     return true;
   }
 
-  @Test
-  public void testGetEffectiveJvmFallbackUsesJvmProperty() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetEffectiveJvmFallbackUsesJvmProperty(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
     executeMaven(
         this::assertGetEffectiveJvmFallbackUsesJvmProperty,
         "samplePom.xml",
@@ -221,10 +262,16 @@ private boolean assertGetEffectiveJvmFallbackUsesJvmProperty(ExecutionEvent exec
     return true;
   }
 
-  @Test
-  public void testGetEffectiveJvmFallbackUsesToolchains() throws Exception {
-    Assume.assumeTrue(surefirePluginVersion.compareTo(SUREFIRE_3_0_0) >= 0);
-    Assume.assumeTrue(getCurrentMavenVersion().compareTo(MAVEN_3_3_1) >= 0);
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetEffectiveJvmFallbackUsesToolchains(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
+    Assumptions.assumeTrue(surefirePluginVersion.compareTo(SUREFIRE_3_0_0) >= 0);
+    Assumptions.assumeTrue(getCurrentMavenVersion().compareTo(MAVEN_3_3_1) >= 0);
 
     File toolchainsFile = createToolchainsFile();
     executeMaven(
@@ -257,7 +304,7 @@ private static File createToolchainsFile()
     Map<String, String> replacements =
         Collections.singletonMap("my_jdk_home_path", toolchainJdkHome.getAbsolutePath());
 
-    File toolchainsFile = WORKING_DIRECTORY.getRoot().resolve("toolchains.xml").toFile();
+    File toolchainsFile = WORKING_DIRECTORY.resolve("toolchains.xml").toFile();
     try (FileWriter toolchainsFileWriter = new FileWriter(toolchainsFile)) {
       Template coveragesTemplate = FREEMARKER.getTemplate("sampleToolchains.ftl");
       coveragesTemplate.process(replacements, toolchainsFileWriter);
@@ -265,8 +312,14 @@ private static File createToolchainsFile()
     return toolchainsFile;
   }
 
-  @Test
-  public void testGetForkedJvmPath() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetForkedJvmPath(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
     executeMaven(
         this::assertGetForkedJvmPath,
         "samplePomJacoco.xml",
@@ -285,8 +338,14 @@ private boolean assertGetForkedJvmPath(ExecutionEvent executionEvent) {
     return true;
   }
 
-  @Test
-  public void testGetClasspath() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetClasspath(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
     executeMaven(
         this::assertGetClasspath,
         "samplePom.xml",
@@ -310,9 +369,15 @@ private boolean assertGetClasspath(ExecutionEvent executionEvent) {
     return true;
   }
 
-  @Test
-  public void testGetClasspathConsidersAdditionalClasspathDependencies() throws Exception {
-    Assume.assumeTrue(surefirePluginVersion.compareTo(SUREFIRE_3_2_0) >= 0);
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetClasspathConsidersAdditionalClasspathDependencies(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
+    Assumptions.assumeTrue(surefirePluginVersion.compareTo(SUREFIRE_3_2_0) >= 0);
     executeMaven(
         this::assertGetClasspathConsidersAdditionalClasspathDependencies,
         "samplePomAdditionalClasspathDependencies.xml",
@@ -337,8 +402,14 @@ private boolean assertGetClasspathConsidersAdditionalClasspathDependencies(
     return true;
   }
 
-  @Test
-  public void testGetClasspathConsidersAdditionalClasspathElements() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetClasspathConsidersAdditionalClasspathElements(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
     executeMaven(
         this::assertGetClasspathConsidersAdditionalClasspathElements,
         "samplePomAdditionalClasspathElements.xml",
@@ -365,8 +436,14 @@ private boolean assertGetClasspathConsidersAdditionalClasspathElements(
     return true;
   }
 
-  @Test
-  public void testGetContainer() throws Exception {
+  @ParameterizedTest
+  @MethodSource("surefireVersions")
+  public void testGetContainer(
+      ComparableVersion surefirePluginVersion, ComparableVersion minRequiredMavenVersion)
+      throws Exception {
+    Assumptions.assumeTrue(
+        minRequiredMavenVersion.compareTo(getCurrentMavenVersion()) <= 0,
+        "Newer maven version required to run chosen version of Surefire plugin");
     executeMaven(
         this::assertGetContainer,
         "samplePom.xml",
@@ -385,18 +462,6 @@ private boolean assertGetContainer(ExecutionEvent executionEvent) {
     return true;
   }
 
-  @Parameterized.Parameters(name = "{0}")
-  public static Collection<Object[]> surefireVersions() {
-    return Arrays.asList(
-        new Object[][] {
-          {new ComparableVersion("2.17"), new ComparableVersion("3.0.0")},
-          {new ComparableVersion("2.21.0"), new ComparableVersion("3.0.0")},
-          {new ComparableVersion("3.0.0"), new ComparableVersion("3.0.0")},
-          {new ComparableVersion("3.5.0"), new ComparableVersion("3.6.3")},
-          {new ComparableVersion(getLatestMavenSurefireVersion()), new ComparableVersion("3.6.3")}
-        });
-  }
-
   private static String getLatestMavenSurefireVersion() {
     OkHttpClient client = new OkHttpClient();
     Request request =
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/GenerationalUtf8Cache.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/GenerationalUtf8Cache.java
index ec815ce3936..12854f86d5e 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/GenerationalUtf8Cache.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/GenerationalUtf8Cache.java
@@ -85,7 +85,7 @@ public final class GenerationalUtf8Cache implements EncodingCache {
   private static final double EDEN_PROPORTION = 1D / 3D;
   private static final double TENURED_PROPORTION = 1 - EDEN_PROPORTION;
 
-  private static final int MAX_ENTRY_LEN = 256;
+  static final int MAX_ENTRY_LEN = 256;
 
   private final CacheEntry[] edenEntries;
   private final int[] edenMarkers;
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/SimpleUtf8Cache.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/SimpleUtf8Cache.java
index b1786753246..ab751b6a5ac 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/SimpleUtf8Cache.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/SimpleUtf8Cache.java
@@ -53,7 +53,7 @@ public final class SimpleUtf8Cache implements EncodingCache {
   private static final double HIT_DECAY = 0.5D;
   private static final double PURGE_THRESHOLD = 0.25D;
 
-  private static final int MAX_ENTRY_LEN = 128;
+  static final int MAX_ENTRY_LEN = 128;
 
   protected int hits = 0;
   protected int evictions = 0;
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/CachingTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/CachingTest.java
index 87e709d8910..51c6f1d79fe 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/CachingTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/CachingTest.java
@@ -1,10 +1,10 @@
 package datadog.trace.common.writer.ddagent;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CachingTest {
   @Test
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/GenerationalUtf8CacheTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/GenerationalUtf8CacheTest.java
index 3412a40dc13..facd64e71dc 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/GenerationalUtf8CacheTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/GenerationalUtf8CacheTest.java
@@ -1,15 +1,15 @@
 package datadog.trace.common.writer.ddagent;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -148,7 +148,7 @@ public void fuzz() {
   @Test
   public void bigString_dont_cache() {
     String lorem = "Lorem ipsum dolor sit amet";
-    while (lorem.length() < 500) {
+    while (lorem.length() <= GenerationalUtf8Cache.MAX_ENTRY_LEN) {
       lorem += lorem;
     }
     byte[] expected = lorem.getBytes(StandardCharsets.UTF_8);
diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/SimpleUtf8CacheTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/SimpleUtf8CacheTest.java
index 5921a751cd5..521bf229e4d 100644
--- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/SimpleUtf8CacheTest.java
+++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/SimpleUtf8CacheTest.java
@@ -1,15 +1,15 @@
 package datadog.trace.common.writer.ddagent;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -96,7 +96,7 @@ public void fuzz() {
   @Test
   public void bigString_dont_cache() {
     String lorem = "Lorem ipsum dolor sit amet";
-    while (lorem.length() < 100) {
+    while (lorem.length() <= SimpleUtf8Cache.MAX_ENTRY_LEN) {
       lorem += lorem;
     }
     byte[] expected = lorem.getBytes(StandardCharsets.UTF_8);
@@ -153,8 +153,6 @@ static final String nextValue() {
   }
 
   static final void printStats(SimpleUtf8Cache cache) {
-    System.out.printf(
-        "eden hits: %5d\tpromotion hits: %5d\tpromotions: %5d\tearly: %5d\tlocal evictions: %5d\tglobal evictions: %5d%n",
-        cache.hits, cache.evictions);
+    System.out.printf("eden hits: %5d\tpromotions: %5d%n", cache.hits, cache.evictions);
   }
 }