diff --git a/compiler-rt/test/lit.common.cfg b/compiler-rt/test/lit.common.cfg
index 795435048fb5..aa3fd03add5a 100644
--- a/compiler-rt/test/lit.common.cfg
+++ b/compiler-rt/test/lit.common.cfg
@@ -160,3 +160,8 @@ except OSError:
 if re.search(r'ON', llvm_config_cmd.stdout.read().decode('ascii')):
   config.available_features.add('asserts')
 llvm_config_cmd.wait()
+
+# Sanitizer tests tend to be flaky on Windows due to PR24554, so add some
+# retries. We don't do this on otther platforms because it's slower.
+if platform.system() == 'Windows':
+  config.test_retry_attempts = 2