diff --git a/.gitlab-ci/bare-metal/fastboot_run.py b/.gitlab-ci/bare-metal/fastboot_run.py
index eb0b7d4e8ad..5def91aa183 100755
--- a/.gitlab-ci/bare-metal/fastboot_run.py
+++ b/.gitlab-ci/bare-metal/fastboot_run.py
@@ -31,7 +31,9 @@ import threading
 class FastbootRun:
     def __init__(self, args):
         self.powerup = args.powerup
-        self.ser = SerialBuffer(args.dev, "results/serial-output.txt", "R SERIAL> ")
+        # We would like something like a 1 minute timeout, but the piglit traces
+        # jobs stall out for long periods of time.
+        self.ser = SerialBuffer(args.dev, "results/serial-output.txt", "R SERIAL> ", timeout=600)
         self.fastboot="fastboot boot -s {ser} artifacts/fastboot.img".format(ser=args.fbserial)
 
     def print_error(self, message):
@@ -59,7 +61,7 @@ class FastbootRun:
 
         if not fastboot_ready:
             self.print_error("Failed to get to fastboot prompt")
-            return 1
+            return 2
 
         if self.logged_system(self.fastboot) != 0:
             return 1
@@ -87,8 +89,8 @@ class FastbootRun:
                 else:
                     return 1
 
-        self.print_error("Reached the end of the CPU serial log without finding a result")
-        return 1
+        self.print_error("Reached the end of the CPU serial log without finding a result, restarting run...")
+        return 2
 
 def main():
     parser = argparse.ArgumentParser()
@@ -105,6 +107,8 @@ def main():
         if retval != 2:
             break
 
+        fastboot = FastbootRun(args)
+
     fastboot.logged_system(args.powerdown)
 
     sys.exit(retval)