diff --git a/.github/g2j-migrated-modules.txt b/.github/g2j-migrated-modules.txt
index 229a57d87f0..118406ecd1a 100644
--- a/.github/g2j-migrated-modules.txt
+++ b/.github/g2j-migrated-modules.txt
@@ -7,3 +7,4 @@
 
 buildSrc/call-site-instrumentation-plugin
 components/json
+dd-trace-api
diff --git a/dd-trace-api/src/test/groovy/datadog/trace/api/interceptor/AbstractTraceInterceptorTest.groovy b/dd-trace-api/src/test/groovy/datadog/trace/api/interceptor/AbstractTraceInterceptorTest.groovy
deleted file mode 100644
index 904edf3d39f..00000000000
--- a/dd-trace-api/src/test/groovy/datadog/trace/api/interceptor/AbstractTraceInterceptorTest.groovy
+++ /dev/null
@@ -1,20 +0,0 @@
-package datadog.trace.api.interceptor
-
-import spock.lang.Specification
-
-class AbstractTraceInterceptorTest extends Specification {
-
-  def "priority index is taken from enum"() {
-    given:
-    def priority = AbstractTraceInterceptor.Priority.values()[0]
-    def interceptor = new AbstractTraceInterceptor(priority) {
-        @Override
-        Collection<? extends MutableSpan> onTraceComplete(Collection<? extends MutableSpan> trace) {
-          return null
-        }
-      }
-
-    expect:
-    interceptor.priority() == priority.idx
-  }
-}
diff --git a/dd-trace-api/src/test/groovy/datadog/trace/api/internal/util/HexStringUtilsTest.groovy b/dd-trace-api/src/test/groovy/datadog/trace/api/internal/util/HexStringUtilsTest.groovy
deleted file mode 100644
index c8958d1c66d..00000000000
--- a/dd-trace-api/src/test/groovy/datadog/trace/api/internal/util/HexStringUtilsTest.groovy
+++ /dev/null
@@ -1,38 +0,0 @@
-package datadog.trace.api.internal.util
-
-import spock.lang.Specification
-
-class HexStringUtilsTest extends Specification {
-  def "test hexadecimal String representations #highOrderBits | #lowOrderBits [#size]"() {
-    when:
-    def highOrder = highOrderSize == 0 ? "" : LongStringUtils.toHexStringPadded(highOrderBits, highOrderSize)
-    def lowOrder = LongStringUtils.toHexStringPadded(lowOrderBits, lowOrderSize)
-    def lowOrderOnly = LongStringUtils.toHexStringPadded(lowOrderBits, size)
-
-    then:
-    LongStringUtils.toHexStringPadded(highOrderBits, lowOrderBits, size) == highOrder + lowOrder
-    LongStringUtils.toHexStringPadded(0L, lowOrderBits, size) == lowOrderOnly
-
-    where:
-    highOrderBits        | lowOrderBits         | size
-    0L                   | 0L                   | 10
-    0L                   | 0L                   | 16
-    0L                   | 0L                   | 20
-    0L                   | 0L                   | 32
-    0L                   | 0L                   | 40
-    1L                   | 2L                   | 10
-    1L                   | 2L                   | 16
-    1L                   | 2L                   | 20
-    1L                   | 2L                   | 32
-    1L                   | 2L                   | 40
-    6536977903480360123L | 3270264562721133536L | 10
-    6536977903480360123L | 3270264562721133536L | 16
-    6536977903480360123L | 3270264562721133536L | 20
-    6536977903480360123L | 3270264562721133536L | 32
-    6536977903480360123L | 3270264562721133536L | 40
-
-    highOrderUsed = size > 16
-    highOrderSize = Math.min(16, Math.max(0, size - 16))
-    lowOrderSize = Math.min(16, size)
-  }
-}
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/interceptor/AbstractTraceInterceptorTest.java b/dd-trace-api/src/test/java/datadog/trace/api/interceptor/AbstractTraceInterceptorTest.java
new file mode 100644
index 00000000000..c3bdf503108
--- /dev/null
+++ b/dd-trace-api/src/test/java/datadog/trace/api/interceptor/AbstractTraceInterceptorTest.java
@@ -0,0 +1,24 @@
+package datadog.trace.api.interceptor;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Collection;
+import org.junit.jupiter.api.Test;
+
+class AbstractTraceInterceptorTest {
+
+  @Test
+  void priorityIndexIsTakenFromEnum() {
+    AbstractTraceInterceptor.Priority priority = AbstractTraceInterceptor.Priority.values()[0];
+    AbstractTraceInterceptor interceptor =
+        new AbstractTraceInterceptor(priority) {
+          @Override
+          public Collection<? extends MutableSpan> onTraceComplete(
+              Collection<? extends MutableSpan> trace) {
+            return null;
+          }
+        };
+
+    assertEquals(priority.getIdx(), interceptor.priority());
+  }
+}
diff --git a/dd-trace-api/src/test/java/datadog/trace/api/internal/util/HexStringUtilsTest.java b/dd-trace-api/src/test/java/datadog/trace/api/internal/util/HexStringUtilsTest.java
new file mode 100644
index 00000000000..61cf59b7fc1
--- /dev/null
+++ b/dd-trace-api/src/test/java/datadog/trace/api/internal/util/HexStringUtilsTest.java
@@ -0,0 +1,43 @@
+package datadog.trace.api.internal.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class HexStringUtilsTest {
+
+  @ParameterizedTest(name = "test hexadecimal String representations high={0} low={1} size={2}")
+  @CsvSource(
+      value = {
+        "0|0|10",
+        "0|0|16",
+        "0|0|20",
+        "0|0|32",
+        "0|0|40",
+        "1|2|10",
+        "1|2|16",
+        "1|2|20",
+        "1|2|32",
+        "1|2|40",
+        "6536977903480360123|3270264562721133536|10",
+        "6536977903480360123|3270264562721133536|16",
+        "6536977903480360123|3270264562721133536|20",
+        "6536977903480360123|3270264562721133536|32",
+        "6536977903480360123|3270264562721133536|40"
+      },
+      delimiter = '|')
+  void testHexadecimalStringRepresentations(long highOrderBits, long lowOrderBits, int size) {
+    int highOrderSize = Math.min(16, Math.max(0, size - 16));
+    int lowOrderSize = Math.min(16, size);
+
+    String highOrder =
+        highOrderSize == 0 ? "" : LongStringUtils.toHexStringPadded(highOrderBits, highOrderSize);
+    String lowOrder = LongStringUtils.toHexStringPadded(lowOrderBits, lowOrderSize);
+    String lowOrderOnly = LongStringUtils.toHexStringPadded(lowOrderBits, size);
+
+    assertEquals(
+        highOrder + lowOrder, LongStringUtils.toHexStringPadded(highOrderBits, lowOrderBits, size));
+    assertEquals(lowOrderOnly, LongStringUtils.toHexStringPadded(0L, lowOrderBits, size));
+  }
+}