diff --git a/test/systemtest/earlgrey/test_fpga_nexysvideo.py b/test/systemtest/earlgrey/test_fpga_nexysvideo.py
index 65785c4..77f6374 100644
--- a/test/systemtest/earlgrey/test_fpga_nexysvideo.py
+++ b/test/systemtest/earlgrey/test_fpga_nexysvideo.py
@@ -124,7 +124,10 @@
     """ Load a simple application, and check its output. """
 
     spiflash = bin_dir / 'sw/host/spiflash/spiflash'
-    utils.load_sw_over_spi(tmp_path, spiflash, app_selfchecking_bin)
+    utils.load_sw_over_spi(tmp_path,
+                           spiflash,
+                           app_selfchecking_bin,
+                           timeout=30)
 
     # We need to wait for this message to ensure we are asserting on the output
     # of the newly flashed software, not the software which might be already on
diff --git a/test/systemtest/utils.py b/test/systemtest/utils.py
index 8a03e3e..eb1c596 100644
--- a/test/systemtest/utils.py
+++ b/test/systemtest/utils.py
@@ -364,7 +364,11 @@
             "^^^^^^^^^^^^^^^^^^^^ {} ^^^^^^^^^^^^^^^^^^^^\n".format(f))
 
 
-def load_sw_over_spi(tmp_path, spiflash_path, sw_test_bin, spiflash_args=[]):
+def load_sw_over_spi(tmp_path,
+                     spiflash_path,
+                     sw_test_bin,
+                     spiflash_args=[],
+                     timeout=600):
     """ Use the spiflash utility to load software onto a device. """
 
     log.info("Flashing device software from {} over SPI".format(
@@ -373,7 +377,7 @@
     cmd_flash = [spiflash_path, '--input', sw_test_bin] + spiflash_args
     p_flash = Process(cmd_flash, logdir=tmp_path, cwd=tmp_path)
     p_flash.run()
-    p_flash.proc.wait(timeout=600)
+    p_flash.proc.wait(timeout=timeout)
     assert p_flash.proc.returncode == 0
 
     log.info("Device software flashed.")