diff --git a/fvp_utils.sh b/fvp_utils.sh
index 1101d94..a366909 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -264,8 +264,10 @@
     # feature, so for the moment avoid creating any LAVA test job definition
     # for this model until a solution is found.
     # [1] https://tf.validation.linaro.org/scheduler/job/33871
-    if echo "$JENKINS_URL" | grep -q -v "arm.com" && [ "${model}" = "foundationv8" ]; then
-        return
+    if ! is_arm_jenkins_env; then
+     if [ "${model}" = "foundationv8" ]; then
+         return
+     fi
     fi
 
     # optional parameters, defaults to globals
diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index 2f9cd17..ef29c3b 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -82,7 +82,7 @@
 
 EOF
 
-if echo "$JENKINS_URL" | grep -q -v "arm.com"; then
+if ! is_arm_jenkins_env; then
 	cat <<EOF >>"$model_param_file"
 -C bp.pl011_uart0.untimed_fifos=1
 -C bp.pl011_uart1.untimed_fifos=1