diff --git a/CommonConfig.cmake b/CommonConfig.cmake
index 964a51c..870e896 100644
--- a/CommonConfig.cmake
+++ b/CommonConfig.cmake
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2018, Arm Limited. All rights reserved.
+# Copyright (c) 2018-2019, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -126,7 +126,7 @@
 if (CORE_TEST)
 	set(CORE_TEST_POSITIVE ON)
 	set(CORE_TEST_INTERACTIVE OFF)
-	set (TFM_PARTITION_TEST_SECURE_SERVICES ON)
+	set(TFM_PARTITION_TEST_SECURE_SERVICES ON)
 	add_definitions(-DTFM_PARTITION_TEST_SECURE_SERVICES)
 endif()
 
@@ -171,6 +171,20 @@
 	add_definitions(-DTFM_PARTITION_TEST_SST)
 endif()
 
+if (PSA_API_TEST)
+	add_definitions(-DPSA_API_TEST_NS)
+	set(PSA_API_TEST_NS ON)
+	if (NOT DEFINED PSA_API_TEST_CRYPTO)
+		set(PSA_API_TEST_CRYPTO OFF)
+	endif()
+	if (NOT DEFINED PSA_API_TEST_SECURE_STORAGE)
+		set(PSA_API_TEST_SECURE_STORAGE OFF)
+	endif()
+	if (NOT DEFINED PSA_API_TEST_ATTESTATION)
+		set(PSA_API_TEST_ATTESTATION OFF)
+	endif()
+endif()
+
 # This flag indicates if the non-secure OS is capable of identify the non-secure clients
 # which call the secure services
 if (NOT DEFINED TFM_NS_CLIENT_IDENTIFICATION)