diff --git a/testng-core/src/test/java/test/retryAnalyzer/RetryAnalyzerTest.java b/testng-core/src/test/java/test/retryAnalyzer/RetryAnalyzerTest.java
index b439f97eb..f40aca0ac 100644
--- a/testng-core/src/test/java/test/retryAnalyzer/RetryAnalyzerTest.java
+++ b/testng-core/src/test/java/test/retryAnalyzer/RetryAnalyzerTest.java
@@ -46,7 +46,7 @@ public class RetryAnalyzerTest extends SimpleBaseTest {
   @Test(description = "GITHUB-2798")
   public void ensureNoDuplicateRetryAnalyzerInstancesAreCreated() {
     create(TestClassSample.class).run();
-    Map<Integer, Long> collected =
+    Map<String, Long> collected =
         HashCodeAwareRetryAnalyzer.hashCodes.stream()
             .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
     assertThat(collected.keySet())
diff --git a/testng-core/src/test/java/test/retryAnalyzer/issue2798/HashCodeAwareRetryAnalyzer.java b/testng-core/src/test/java/test/retryAnalyzer/issue2798/HashCodeAwareRetryAnalyzer.java
index e82a22ce6..c0a874bf5 100644
--- a/testng-core/src/test/java/test/retryAnalyzer/issue2798/HashCodeAwareRetryAnalyzer.java
+++ b/testng-core/src/test/java/test/retryAnalyzer/issue2798/HashCodeAwareRetryAnalyzer.java
@@ -2,23 +2,26 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import org.testng.IRetryAnalyzer;
 import org.testng.ITestResult;
 import org.testng.internal.AutoCloseableLock;
 
 public class HashCodeAwareRetryAnalyzer implements IRetryAnalyzer {
 
-  public static final List<Integer> hashCodes = new ArrayList<>();
+  public static final List<String> hashCodes = new ArrayList<>();
 
   private static final AutoCloseableLock lock = new AutoCloseableLock();
 
+  private final UUID id = UUID.randomUUID();
+
   int cnt = 0;
   static final int threshold = 2;
 
   @Override
   public boolean retry(ITestResult result) {
     try (AutoCloseableLock ignore = lock.lock()) {
-      hashCodes.add(this.hashCode());
+      hashCodes.add(id.toString());
       return cnt++ < threshold;
     }
   }