diff --git a/Android.mk b/Android.mk
index 8374cd5..ace24a0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,6 +23,7 @@
 	xtest_10000.c \
 	xtest_20000.c \
 	xtest_benchmark_1000.c \
+	xtest_benchmark_2000.c \
 	xtest_helpers.c \
 	xtest_main.c \
 	xtest_test.c \
@@ -35,7 +36,9 @@
 	adbg/src/adbg_util.c \
 	adbg/src/r_list_genutil.c \
 	adbg/src/security_utils_hex.c \
-	adbg/src/security_utils_mem.c
+	adbg/src/security_utils_mem.c \
+	aes_perf.c \
+	sha_perf.c
 
 LOCAL_SRC_FILES := $(patsubst %,host/xtest/%,$(srcs))
 
@@ -53,7 +56,8 @@
 		$(LOCAL_PATH)/ta/sims/include \
 		$(LOCAL_PATH)/ta/storage/include \
 		$(LOCAL_PATH)/ta/storage_benchmark/include \
-		$(LOCAL_PATH)/ta/sha_perf/include
+		$(LOCAL_PATH)/ta/sha_perf/include \
+		$(LOCAL_PATH)/ta/aes_perf/include
 
 # Include configuration file generated by OP-TEE OS (CFG_* macros)
 LOCAL_CFLAGS += -include conf.h
diff --git a/ta/aes_perf/Android.mk b/ta/aes_perf/Android.mk
index 54d3449..dac214d 100644
--- a/ta/aes_perf/Android.mk
+++ b/ta/aes_perf/Android.mk
@@ -1,4 +1,4 @@
 LOCAL_PATH := $(call my-dir)
 
-local_module := e626662e-c0e2-485c-b8c809fbce6edf3d
+local_module := e626662e-c0e2-485c-b8c809fbce6edf3d.ta
 include $(BUILD_OPTEE_MK)
diff --git a/ta/sha_perf/Android.mk b/ta/sha_perf/Android.mk
index f6cf4e8..5fa6bd2 100644
--- a/ta/sha_perf/Android.mk
+++ b/ta/sha_perf/Android.mk
@@ -1,4 +1,4 @@
 LOCAL_PATH := $(call my-dir)
 
-local_module := 614789f2-39c0-4ebf-b23592b32ac107ed
+local_module := 614789f2-39c0-4ebf-b23592b32ac107ed.ta
 include $(BUILD_OPTEE_MK)