diff --git a/CommonConfig.cmake b/CommonConfig.cmake
index bb56736..314377b 100644
--- a/CommonConfig.cmake
+++ b/CommonConfig.cmake
@@ -46,10 +46,10 @@
 
 #Settings which shall be set for all projects the same way based
 # on the variables above.
-set (CORE_TEST_SERVICES OFF)
+set (TFM_PARTITION_TEST_CORE OFF)
 set (CORE_TEST_POSITIVE OFF)
 set (CORE_TEST_INTERACTIVE OFF)
-set (SST_TEST_SERVICES OFF)
+set (TFM_PARTITION_TEST_SST OFF)
 
 if (REGRESSION)
 	set(SERVICES_TEST_ENABLED ON)
@@ -72,13 +72,13 @@
 if(CORE_TEST_INTERACTIVE)
 	add_definitions(-DCORE_TEST_INTERACTIVE)
 	set(TEST_FRAMEWORK_NS ON)
-	set(CORE_TEST_SERVICES ON)
+	set(TFM_PARTITION_TEST_CORE ON)
 endif()
 
 if(CORE_TEST_POSITIVE)
 	add_definitions(-DCORE_TEST_POSITIVE)
 	set(TEST_FRAMEWORK_NS ON)
-	set(CORE_TEST_SERVICES ON)
+	set(TFM_PARTITION_TEST_CORE ON)
 endif()
 
 if (SERVICE_TEST_S)
@@ -89,7 +89,7 @@
 if (SERVICE_TEST_NS)
 	add_definitions(-DSERVICES_TEST_NS)
 	set(TEST_FRAMEWORK_NS ON)
-	set(SST_TEST_SERVICES ON)
+	set(TFM_PARTITION_TEST_SST ON)
 endif()
 
 if(TEST_FRAMEWORK_S)
@@ -100,12 +100,12 @@
 	add_definitions(-DTEST_FRAMEWORK_NS)
 endif()
 
-if (CORE_TEST_SERVICES)
-	add_definitions(-DCORE_TEST_SERVICES)
+if (TFM_PARTITION_TEST_CORE)
+	add_definitions(-DTFM_PARTITION_TEST_CORE)
 endif()
 
-if (SST_TEST_SERVICES)
-	add_definitions(-DSST_TEST_SERVICES)
+if (TFM_PARTITION_TEST_SST)
+	add_definitions(-DTFM_PARTITION_TEST_SST)
 endif()
 
 if (BL2)