Index: node-git.b4f0a18b5a/tools/test.py
===================================================================
--- node-git.b4f0a18b5a.orig/tools/test.py
+++ node-git.b4f0a18b5a/tools/test.py
@@ -537,6 +537,16 @@ class TestCase(object):
                       self.context.store_unexpected_output)
 
   def Run(self):
+    reruns = 0
+    while (reruns < 5):
+        reruns += 1
+        result = self.OriginalRun()
+        if (not result.HasFailed()):
+            break
+        print("FLAKY TEST rerun: ", self.GetCommand())
+    return result
+
+  def OriginalRun(self):
     try:
       result = self.RunCommand(self.GetCommand(), {
         "TEST_SERIAL_ID": "%d" % self.serial_id,