diff --git a/fvp.mk b/fvp.mk
index 8aac1406940886587cac2305fc1acd91f78af4c9..1d4079307e6492d042dbca9a750f7cc9260940c0 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -10,7 +10,7 @@ CROSS_COMPILE_NS_KERNEL	?= "$(CCACHE)$(AARCH64_CROSS_COMPILE)"
 CROSS_COMPILE_S_USER	?= "$(CCACHE)$(AARCH32_CROSS_COMPILE)"
 CROSS_COMPILE_S_KERNEL	?= "$(CCACHE)$(AARCH32_CROSS_COMPILE)"
 OPTEE_OS_BIN		?= $(OPTEE_OS_PATH)/out/arm-plat-vexpress/core/tee.bin
-OPTEE_OS_TA_DEV_KIT_DIR	?= $(OPTEE_OS_PATH)/out/arm-plat-vexpress/export-user_ta
+OPTEE_OS_TA_DEV_KIT_DIR	?= $(OPTEE_OS_PATH)/out/arm-plat-vexpress/export-ta_arm32
 
 ################################################################################
 # Paths to git projects and various binaries
diff --git a/qemu.mk b/qemu.mk
index a7a117fea032117cb450bab0be20815a50c86874..5bdc0c2b27979178e6acfaf7979c3582d80db7c6 100644
--- a/qemu.mk
+++ b/qemu.mk
@@ -15,7 +15,7 @@ CROSS_COMPILE_S_USER		?= "$(CCACHE)$(AARCH32_CROSS_COMPILE)"
 CROSS_COMPILE_S_KERNEL		?= "$(CCACHE)$(AARCH32_CROSS_COMPILE)"
 endif
 OPTEE_OS_BIN			?= $(OPTEE_OS_PATH)/out/arm-plat-vexpress/core/tee.bin
-OPTEE_OS_TA_DEV_KIT_DIR		?= $(OPTEE_OS_PATH)/out/arm-plat-vexpress/export-user_ta
+OPTEE_OS_TA_DEV_KIT_DIR		?= $(OPTEE_OS_PATH)/out/arm-plat-vexpress/export-ta_arm32
 
 ################################################################################
 # Paths to git projects and various binaries