diff --git a/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch b/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch
index 7ea5574..0919a22 100644
--- a/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch
+++ b/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch
@@ -1,7 +1,7 @@
-From 2cecdb4de4ac2f18f8bdc080a29fa1223381557e Mon Sep 17 00:00:00 2001
+From 7678a1ab55c2ef708778b51b67e0c3929c071b43 Mon Sep 17 00:00:00 2001
 From: Summer Qin <summer.qin@arm.com>
 Date: Tue, 29 Aug 2023 17:08:19 +0800
-Subject: [PATCH 1/2] Place crypto test 16 at the beginning of the test
+Subject: [PATCH 1/3] Place crypto test 16 at the beginning of the test
 
 HMAC_DRBG random generator is slower than CTR_DRBG, and this
 will influence the time spending for test 16 RSA 2048. Placing
diff --git a/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch b/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch
index 95d9524..e070138 100644
--- a/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch
+++ b/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch
@@ -1,7 +1,7 @@
-From 0dc63dd95d958997bfa31f5ae8bde8b603523c9e Mon Sep 17 00:00:00 2001
+From 61611b8b3bb70ab30fb0830f3bd816b6ddccaca0 Mon Sep 17 00:00:00 2001
 From: Summer Qin <summer.qin@arm.com>
 Date: Sun, 8 Oct 2023 16:44:42 +0800
-Subject: [PATCH 2/2] Crypto: Add psa crypto config link for crypto tests
+Subject: [PATCH 2/3] Crypto: Add psa crypto config link for crypto tests
 
 Test 16 uses macro PSA_EXPORT_KEY_PAIR_MAX_SIZE which is
 related with PSA_WANT_KEY_TYPE_xxx_KEY_PAIR_BASIC defines
diff --git a/tests_psa_arch/fetch_repo/0003-Build-Add-manifest-tool-dependencies.patch b/tests_psa_arch/fetch_repo/0003-Build-Add-manifest-tool-dependencies.patch
new file mode 100644
index 0000000..06bf15d
--- /dev/null
+++ b/tests_psa_arch/fetch_repo/0003-Build-Add-manifest-tool-dependencies.patch
@@ -0,0 +1,41 @@
+From 5c84de8edab657b51430d7aba03410292d70e3b2 Mon Sep 17 00:00:00 2001
+From: Kevin Peng <kevin.peng@arm.com>
+Date: Thu, 9 Nov 2023 14:40:48 +0800
+Subject: [PATCH 3/3] Build: Add manifest tool dependencies
+
+Signed-off-by: Kevin Peng <kevin.peng@arm.com>
+---
+ api-tests/CMakeLists.txt    | 1 +
+ api-tests/val/val_spe.cmake | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/api-tests/CMakeLists.txt b/api-tests/CMakeLists.txt
+index f5e45c1..73c9390 100644
+--- a/api-tests/CMakeLists.txt
++++ b/api-tests/CMakeLists.txt
+@@ -673,6 +673,7 @@ add_dependencies(${PSA_TARGET_GENERATE_DATABASE_POST}	${PSA_TARGET_GENERATE_DATA
+ add_dependencies(${PSA_TARGET_PAL_NSPE_LIB} 		${PSA_TARGET_GENERATE_DATABASE_POST})
+ add_dependencies(${PSA_TARGET_VAL_NSPE_LIB}		${PSA_TARGET_PAL_NSPE_LIB})
+ add_dependencies(${PSA_TARGET_TEST_COMBINE_LIB}		${PSA_TARGET_VAL_NSPE_LIB})
++add_dependencies(${PSA_TARGET_TEST_COMBINE_LIB}		manifest_tool)
+ if(${SUITE} STREQUAL "IPC")
+ add_dependencies(${PSA_TARGET_DRIVER_PARTITION_LIB}	${PSA_TARGET_TEST_COMBINE_LIB})
+ add_dependencies(${PSA_TARGET_CLIENT_PARTITION_LIB}	${PSA_TARGET_DRIVER_PARTITION_LIB})
+diff --git a/api-tests/val/val_spe.cmake b/api-tests/val/val_spe.cmake
+index 37b8888..4692003 100644
+--- a/api-tests/val/val_spe.cmake
++++ b/api-tests/val/val_spe.cmake
+@@ -53,6 +53,10 @@ add_library(${PSA_TARGET_CLIENT_PARTITION_LIB} STATIC ${PARTITION_IPC_CLIENT_SRC
+ # Create Server partition library
+ add_library(${PSA_TARGET_SERVER_PARTITION_LIB} STATIC ${PARTITION_IPC_SERVER_SRC_C_SPE} ${SUITE_SERVER_CC_SRC_SPE})
+ 
++add_dependencies(${PSA_TARGET_DRIVER_PARTITION_LIB} manifest_tool)
++add_dependencies(${PSA_TARGET_CLIENT_PARTITION_LIB} manifest_tool)
++add_dependencies(${PSA_TARGET_SERVER_PARTITION_LIB} manifest_tool)
++
+ target_include_directories(${PSA_TARGET_DRIVER_PARTITION_LIB} PRIVATE
+ 	${CMAKE_CURRENT_BINARY_DIR}
+ 	${PSA_ROOT_DIR}/val/common
+-- 
+2.25.1
+
diff --git a/tests_psa_arch/spe/partitions/CMakeLists.txt b/tests_psa_arch/spe/partitions/CMakeLists.txt
index 24a4c60..85e59cb 100644
--- a/tests_psa_arch/spe/partitions/CMakeLists.txt
+++ b/tests_psa_arch/spe/partitions/CMakeLists.txt
@@ -118,10 +118,6 @@
         tfm_app_rot_partition_server_partition
 )
 
-add_dependencies(tfm_psa_rot_partition_driver_partition manifest_tool)
-add_dependencies(tfm_app_rot_partition_client_partition manifest_tool)
-add_dependencies(tfm_app_rot_partition_server_partition manifest_tool)
-
 # Extra files required for IPC suit.
 
 install(FILES       ${CMAKE_BINARY_DIR}/generated/interface/include/psa_manifest/pid.h