diff --git a/fvp_utils.sh b/fvp_utils.sh
index 0e186b0..5f12d3d 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -39,17 +39,18 @@
 
 uboot32_fip_url="$linaro_release/fvp32-latest-busybox-uboot/fip.bin"
 if [[ "$test_config" == *handoff* ]]; then
+	optee_path=$tfa_downloads/optee/handoff/4.6.0
 	uboot_url="${tfa_downloads}/handoff/fvp/u-boot.bin"
 else
+	optee_version="4.5.0"
+
+	optee_path=$tfa_downloads/optee/${optee_version}
 	uboot_url="$linaro_release/fvp-latest-busybox-uboot/bl33-uboot.bin"
 fi
 uboot_script_url="${tfa_downloads}/linux_boot/fvp/boot.scr"
 
 rootfs_url="$linaro_release/lt-vexpress64-openembedded_minimal-armv8-gcc-5.2_20170127-761.img.gz"
 
-optee_version="4.5.0"
-optee_path=$tfa_downloads/optee/${optee_version}
-
 # Default FVP model variables
 default_model_dtb="dtb.bin"