diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java
index c0082e8fd22..9a87fdd630e 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/Configurations.java
@@ -1,5 +1,6 @@
 package datadog.trace.api.civisibility.config;
 
+import datadog.trace.util.HashingUtils;
 import java.util.Map;
 import java.util.Objects;
 
@@ -93,16 +94,17 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(
-        osPlatform,
-        osArchitecture,
-        osVersion,
-        runtimeName,
-        runtimeVersion,
-        runtimeVendor,
-        runtimeArchitecture,
-        testBundle,
-        custom);
+    int hash = 0;
+    hash = HashingUtils.addToHash(hash, osPlatform);
+    hash = HashingUtils.addToHash(hash, osArchitecture);
+    hash = HashingUtils.addToHash(hash, osVersion);
+    hash = HashingUtils.addToHash(hash, runtimeName);
+    hash = HashingUtils.addToHash(hash, runtimeVersion);
+    hash = HashingUtils.addToHash(hash, runtimeVendor);
+    hash = HashingUtils.addToHash(hash, runtimeArchitecture);
+    hash = HashingUtils.addToHash(hash, testBundle);
+    hash = HashingUtils.addToHash(hash, custom);
+    return hash;
   }
 
   @Override
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java
index 9534f4e6db1..bb976b4a454 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestFQN.java
@@ -1,5 +1,6 @@
 package datadog.trace.api.civisibility.config;
 
+import datadog.trace.util.HashingUtils;
 import java.util.Objects;
 
 /**
@@ -37,7 +38,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(suite, name);
+    return HashingUtils.hash(suite, name);
   }
 
   @Override
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java
index 012cbeb886b..57add220896 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestIdentifier.java
@@ -1,5 +1,6 @@
 package datadog.trace.api.civisibility.config;
 
+import datadog.trace.util.HashingUtils;
 import java.util.Objects;
 import javax.annotation.Nullable;
 
@@ -55,7 +56,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(fqn, parameters);
+    return HashingUtils.hash(fqn, parameters);
   }
 
   @Override
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java
index 96fb08545f2..c14bf647ea9 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/TestSourceData.java
@@ -1,5 +1,6 @@
 package datadog.trace.api.civisibility.config;
 
+import datadog.trace.util.HashingUtils;
 import java.lang.reflect.Method;
 import java.util.Objects;
 import javax.annotation.Nullable;
@@ -67,7 +68,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(testClass, testMethod, testMethodName);
+    return HashingUtils.hash(testClass, testMethod, testMethodName);
   }
 
   @Override
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java
index 99f15fa544d..74f1afc0319 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestDescriptor.java
@@ -1,5 +1,6 @@
 package datadog.trace.api.civisibility.events;
 
+import datadog.trace.util.HashingUtils;
 import java.util.Objects;
 import javax.annotation.Nullable;
 
@@ -46,7 +47,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(testSuiteName, testClass, testName, testParameters, testQualifier);
+    return HashingUtils.hash(testSuiteName, testClass, testName, testParameters, testQualifier);
   }
 
   @Override
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java
index f972f9e4c87..2d5ed960b6f 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestSuiteDescriptor.java
@@ -1,5 +1,6 @@
 package datadog.trace.api.civisibility.events;
 
+import datadog.trace.util.HashingUtils;
 import java.util.Objects;
 
 public final class TestSuiteDescriptor {
@@ -26,7 +27,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(testSuiteName, testClass);
+    return HashingUtils.hash(testSuiteName, testClass);
   }
 
   @Override