diff --git a/deployments/psa-api-test/crypto/crypto-api-test.cmake b/deployments/psa-api-test/crypto/crypto-api-test.cmake
index 5ad0930..4063175 100644
--- a/deployments/psa-api-test/crypto/crypto-api-test.cmake
+++ b/deployments/psa-api-test/crypto/crypto-api-test.cmake
@@ -12,6 +12,13 @@
 set(TS_ARCH_TEST_SUITE CRYPTO CACHE STRING "Arch test suite")
 
 #-------------------------------------------------------------------------------
+#  The arch test build system puts its build output under a test suite specific
+#  subdirectory.  The subdirectory name is different from the test suite name
+#  so an additional define is needed to obtain the built library.
+#-------------------------------------------------------------------------------
+set(TS_ARCH_TEST_BUILD_SUBDIR crypto CACHE STRING "Arch test build subdirectory")
+
+#-------------------------------------------------------------------------------
 #  Crypto specific components
 #
 #-------------------------------------------------------------------------------
@@ -27,7 +34,10 @@
 	${TS_ROOT}/deployments/psa-api-test/crypto/crypto_locator.c
 )
 
-# Export psa crypto API
+#-------------------------------------------------------------------------------
+#  Advertise PSA API include paths to PSA Arch tests
+#
+#-------------------------------------------------------------------------------
 list(APPEND PSA_ARCH_TESTS_EXTERNAL_INCLUDE_PATHS ${PSA_CRYPTO_API_INCLUDE})
 
 #-------------------------------------------------------------------------------