diff --git a/pom.xml b/pom.xml
index 9c27017c51..ab50bdd9c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,8 @@
     <cobertura.total-branch-rate>30</cobertura.total-branch-rate>
     <cobertura.halt.failure>false</cobertura.halt.failure>
     <delombok.dir>${project.build.directory}/delombok/org/zanata</delombok.dir>
+    <failsafe.rerunFailingTestsCount>3</failsafe.rerunFailingTestsCount>
+
     <guava.version>18.0</guava.version>
     <gwt.version>2.6.1</gwt.version>
     <icu4j.version>50.1.1</icu4j.version>
@@ -1165,7 +1167,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.12</version>
+          <version>2.18.1</version>
           <configuration>
             <failIfNoTests>true</failIfNoTests>
           </configuration>