diff --git a/build.gradle.kts b/build.gradle.kts
index 1398595b3d2..c69d9c655da 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -528,6 +528,7 @@ allprojects {
         }
 
         apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts")
+        apply(from = "$rootDir/gradle/testRetry.gradle.kts")
     }
 }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 497c0348599..d54b313eca7 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -110,6 +110,8 @@ dependencies {
     implementation("org.jetbrains.intellij.deps:asm-all:8.0.1")
 
     implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.5")
+
+    implementation("org.gradle:test-retry-gradle-plugin:1.1.9")
 }
 
 samWithReceiver {
diff --git a/gradle/testRetry.gradle.kts b/gradle/testRetry.gradle.kts
new file mode 100644
index 00000000000..0179e15b777
--- /dev/null
+++ b/gradle/testRetry.gradle.kts
@@ -0,0 +1,10 @@
+
+apply(plugin = "org.gradle.test-retry")
+
+tasks.withType<Test>().configureEach {
+    configure<org.gradle.testretry.TestRetryTaskExtension> {
+        maxRetries.set(3)
+        maxFailures.set(20)
+        failOnPassedAfterRetry.set(false)
+    }
+}
\ No newline at end of file