diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/RetryAnalyzer.java b/jans-auth-server/client/src/test/java/io/jans/as/client/RetryAnalyzer.java
index a9c5e86d4d2..4550f40a25f 100644
--- a/jans-auth-server/client/src/test/java/io/jans/as/client/RetryAnalyzer.java
+++ b/jans-auth-server/client/src/test/java/io/jans/as/client/RetryAnalyzer.java
@@ -18,7 +18,7 @@ public boolean retry(ITestResult result) {
             retryCount++;
             return true;
         } else {
-            result.getTestContext().getFailedTests().addResult(result, result.getMethod());
+            result.getTestContext().getFailedTests().addResult(result);
         }
         return false;
     }
diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/RetryListener.java b/jans-auth-server/client/src/test/java/io/jans/as/client/RetryListener.java
index 778ed90da80..ad1706ddda3 100644
--- a/jans-auth-server/client/src/test/java/io/jans/as/client/RetryListener.java
+++ b/jans-auth-server/client/src/test/java/io/jans/as/client/RetryListener.java
@@ -1,7 +1,6 @@
 package io.jans.as.client;
 
 import org.testng.IAnnotationTransformer;
-import org.testng.IRetryAnalyzer;
 import org.testng.annotations.ITestAnnotation;
 
 import java.lang.reflect.Constructor;
@@ -13,9 +12,6 @@
 public class RetryListener implements IAnnotationTransformer {
     @Override
     public void transform(ITestAnnotation annotation, Class testClass, Constructor constructor, Method testMethod) {
-        IRetryAnalyzer retry = annotation.getRetryAnalyzer();
-        if (retry == null) {
-            annotation.setRetryAnalyzer(RetryAnalyzer.class);
-        }
+        annotation.setRetryAnalyzer(RetryAnalyzer.class);
     }
 }
\ No newline at end of file