diff --git a/build.gradle b/build.gradle
index 99de67749..72cefe74e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,6 +42,7 @@ buildscript {
 
 plugins {
     id "de.undercouch.download" version "5.5.0"
+    id "org.gradle.test-retry" version "1.5.4" apply false
 }
 
 apply plugin: 'java'
@@ -405,6 +406,19 @@ task integTestRemote(type: RestIntegTestTask) {
     }
 }
 
+
+// test retry configuration
+subprojects {
+    apply plugin: "org.gradle.test-retry"
+    tasks.withType(Test).configureEach {
+        retry {
+            failOnPassedAfterRetry = false
+            maxRetries = 3
+            maxFailures = 10
+        }
+    }
+}
+
 // Automatically sets up the integration test cluster locally
 run {
     doFirst {