diff --git a/src/test/java/test/retryAnalyzer/RetryAnalyzerTest.java b/src/test/java/test/retryAnalyzer/RetryAnalyzerTest.java
index ee3fca6dad..b43e632069 100644
--- a/src/test/java/test/retryAnalyzer/RetryAnalyzerTest.java
+++ b/src/test/java/test/retryAnalyzer/RetryAnalyzerTest.java
@@ -12,6 +12,8 @@
 import org.testng.annotations.Test;
 
 import test.SimpleBaseTest;
+import test.retryAnalyzer.github857.GitHub857Listener;
+import test.retryAnalyzer.github857.GitHub857Sample;
 
 public class RetryAnalyzerTest extends SimpleBaseTest {
     @Test
@@ -34,4 +36,27 @@ public void testInvocationCounts() {
         List<ITestResult> skipped = tla.getSkippedTests();
         assertEquals(skipped.size(), InvocationCountTest.invocations.size() - fsp.size());
     }
+
+    @Test(description = "GITHUB-857: onTestFailure not being called when test is retried")
+    public void onTestFailureShouldBeCalledWhenTestIsRetried() {
+        TestNG tng = create(GitHub857Sample.class);
+        TestListenerAdapter tla = new TestListenerAdapter();
+        tng.addListener(tla);
+
+        tng.run();
+
+        assertEquals(tla.getPassedTests().size(), 0);
+        assertEquals(tla.getFailedButWithinSuccessPercentageTests().size(), 0);
+        assertEquals(tla.getSkippedTests().size(), 1);
+        assertEquals(tla.getSkippedTests().get(0).getMethod().getMethodName(), "test");
+        assertEquals(tla.getFailedTests().size(), 1);
+        assertEquals(tla.getFailedTests().get(0).getMethod().getMethodName(), "test");
+
+        assertEquals(GitHub857Listener.passedTests.size(), 0);
+        assertEquals(GitHub857Listener.failedButWSPerTests.size(), 0);
+        assertEquals(GitHub857Listener.skippedTests.size(), 1);
+        assertEquals(GitHub857Listener.skippedTests.get(0).getMethod().getMethodName(), "test");
+        assertEquals(GitHub857Listener.failedTests.size(), 1);
+        assertEquals(GitHub857Listener.failedTests.get(0).getMethod().getMethodName(), "test");
+    }
 }
diff --git a/src/test/java/test/retryAnalyzer/github857/GitHub857Listener.java b/src/test/java/test/retryAnalyzer/github857/GitHub857Listener.java
new file mode 100644
index 0000000000..2c3714b9d1
--- /dev/null
+++ b/src/test/java/test/retryAnalyzer/github857/GitHub857Listener.java
@@ -0,0 +1,58 @@
+package test.retryAnalyzer.github857;
+
+import org.testng.ITestContext;
+import org.testng.ITestResult;
+import org.testng.TestListenerAdapter;
+import org.testng.collections.Lists;
+
+import java.util.Collections;
+import java.util.List;
+
+public class GitHub857Listener extends TestListenerAdapter {
+
+  public static List<ITestResult>
+      passedTests =
+      Collections.synchronizedList(Lists.<ITestResult>newArrayList());
+  public static List<ITestResult>
+      failedTests =
+      Collections.synchronizedList(Lists.<ITestResult>newArrayList());
+  public static List<ITestResult>
+      skippedTests =
+      Collections.synchronizedList(Lists.<ITestResult>newArrayList());
+  public static List<ITestResult>
+      failedButWSPerTests =
+      Collections.synchronizedList(Lists.<ITestResult>newArrayList());
+
+  @Override
+  public void onTestSuccess(ITestResult result) {
+    passedTests.add(result);
+  }
+
+  @Override
+  public void onTestFailure(ITestResult result) {
+    System.out.println("FAILURE");
+    failedTests.add(result);
+  }
+
+  @Override
+  public void onTestSkipped(ITestResult result) {
+    System.out.println("SKIPPED");
+    skippedTests.add(result);
+  }
+
+  @Override
+  public void onTestFailedButWithinSuccessPercentage(ITestResult result) {
+    failedButWSPerTests.add(result);
+  }
+
+  @Override
+  public void onTestStart(ITestResult result) {
+    System.out.println("START");
+  }
+
+  @Override
+  public void onStart(ITestContext context) {}
+
+  @Override
+  public void onFinish(ITestContext context) {}
+}
diff --git a/src/test/java/test/retryAnalyzer/github857/GitHub857Retry.java b/src/test/java/test/retryAnalyzer/github857/GitHub857Retry.java
new file mode 100644
index 0000000000..74a51b7e4a
--- /dev/null
+++ b/src/test/java/test/retryAnalyzer/github857/GitHub857Retry.java
@@ -0,0 +1,19 @@
+package test.retryAnalyzer.github857;
+
+import org.testng.IRetryAnalyzer;
+import org.testng.ITestResult;
+
+public class GitHub857Retry implements IRetryAnalyzer {
+
+  private static final int MAX_RETRY_COUNT_PER_TEST = 1;
+  private int retryCountPerTest = 0;
+
+  @Override
+  public boolean retry(ITestResult result) {
+    if (retryCountPerTest < MAX_RETRY_COUNT_PER_TEST) {
+      retryCountPerTest++;
+      return true;
+    }
+    return false;
+  }
+}
diff --git a/src/test/java/test/retryAnalyzer/github857/GitHub857Sample.java b/src/test/java/test/retryAnalyzer/github857/GitHub857Sample.java
new file mode 100644
index 0000000000..d15f217e08
--- /dev/null
+++ b/src/test/java/test/retryAnalyzer/github857/GitHub857Sample.java
@@ -0,0 +1,25 @@
+package test.retryAnalyzer.github857;
+
+import org.testng.ITestContext;
+import org.testng.ITestNGMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.fail;
+
+@Listeners(GitHub857Listener.class)
+public class GitHub857Sample {
+
+  @BeforeTest(alwaysRun = true)
+  public void beforeTest(ITestContext context) {
+    for (ITestNGMethod method : context.getAllTestMethods()) {
+      method.setRetryAnalyzer(new GitHub857Retry());
+    }
+  }
+
+  @Test
+  public void test() {
+    fail("Failing");
+  }
+}