diff --git a/meta-arm-bsp/conf/machine/rdn2.conf b/meta-arm-bsp/conf/machine/rdn2.conf
index 2349f1b7..c9f3b26b 100644
--- a/meta-arm-bsp/conf/machine/rdn2.conf
+++ b/meta-arm-bsp/conf/machine/rdn2.conf
@@ -56,3 +56,8 @@ FVP_TERMINALS[css.scp.terminal_uart_scp] ?= "SCP Console"
 FVP_TERMINALS[css.mcp.terminal_uart_mcp] ?= "MCP Console"
 FVP_TERMINALS[css.terminal_ns_uart_ap] ?= "NS Console"
 FVP_TERMINALS[css.terminal_s_uart_ap] ?= "S Console"
+
+# Seeing intermittent test timeout errors in CI where the boot is almost
+# complete.  Lengthen the timeout to allow for more opportunity to
+# complete successfully.
+TEST_FVP_LINUX_BOOT_TIMEOUT = "900"
diff --git a/meta-arm-bsp/conf/machine/rdv2.conf b/meta-arm-bsp/conf/machine/rdv2.conf
index bb83ffce..b24c187a 100644
--- a/meta-arm-bsp/conf/machine/rdv2.conf
+++ b/meta-arm-bsp/conf/machine/rdv2.conf
@@ -58,3 +58,8 @@ FVP_TERMINALS[css.scp.terminal_uart_scp] ?= "SCP Console"
 FVP_TERMINALS[css.mcp.terminal_uart_mcp] ?= "MCP Console"
 FVP_TERMINALS[css.terminal_ns_uart_ap] ?= "NS Console"
 FVP_TERMINALS[css.terminal_s_uart_ap] ?= "S Console"
+
+# Seeing intermittent test timeout errors in CI where the boot is almost
+# complete.  Lengthen the timeout to allow for more opportunity to
+# complete successfully.
+TEST_FVP_LINUX_BOOT_TIMEOUT = "900"