diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index 399ee47..14ce8b8 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2023, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -118,7 +118,7 @@
 # runs, so that FVP trace log was properly dumped (and parsed by LAVA).
 # Don't use it for other OpenCI runs, as it may lead to race condition
 # with LAVA's capturing of FVP output.
-if echo "$RUN_CONFIG" | grep -iq 'tftf'; then
+if echo "$RUN_CONFIG" | grep -Eiq 'tftf|spm'; then
     is_arm_env=0
     if is_arm_jenkins_env; then
         is_arm_env=1