diff --git a/dockerfile-template b/dockerfile-template
index b518e19..4f5fbbd 100644
--- a/dockerfile-template
+++ b/dockerfile-template
@@ -25,6 +25,7 @@
 WORKDIR ${MODEL_DIR}
 
 COPY setup-sshd /usr/sbin/setup-sshd
+COPY stdout-flush-wrapper.sh /usr/bin/stdout-flush-wrapper.sh
 
 # Add the FVP model tarball
 # NOTE: some tarballs contain an installer script others don't, so it may be the case
diff --git a/stdout-flush-wrapper.sh b/stdout-flush-wrapper.sh
new file mode 100755
index 0000000..c164d29
--- /dev/null
+++ b/stdout-flush-wrapper.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# This script is to workaround an apparent LAVA race condition, when it
+# detects "EOF" (i.e. app termination) before it reads out all the stdout
+# from the app (FVP in this case). The wrapper explicitly runs a command
+# in line-buffered mode, that helps a little (LAVA reads more output),
+# but not completely, so we just give LAVA more time with some sleep after
+# command termination.
+
+cmd="$1"
+shift
+stdbuf -oL "$cmd" "$@"
+sleep 3