diff --git a/include/common/test_helpers.h b/include/common/test_helpers.h
index a90fd71..5c0f090 100644
--- a/include/common/test_helpers.h
+++ b/include/common/test_helpers.h
@@ -147,14 +147,19 @@
 	do {									\
 		smc_args version_smc = { SPCI_VERSION };			\
 		smc_ret_values smc_ret = tftf_smc(&version_smc);		\
-		uint32_t version = smc_ret.ret0;				\
+		uint32_t version = smc_ret.ret2;				\
 										\
-		if (version == SMC_UNKNOWN) {					\
+		if (smc_ret.ret0 != SPCI_SUCCESS_SMC32) {			\
 			tftf_testcase_printf("SPM not detected.\n");		\
 			return TEST_RESULT_SKIPPED;				\
 		}								\
+                                                                                \
+		if ((version & SPCI_VERSION_BIT31_MASK) != 0) {                 \
+			tftf_testcase_printf("SPCI_VERSION bad response.\n");	\
+			return TEST_RESULT_SKIPPED;                             \
+		}                                                               \
 										\
-		if (version < SPCI_VERSION_FORM(major, minor)) {		\
+		if (version < MAKE_SPCI_VERSION(major, minor)) {		\
 			tftf_testcase_printf("SPCI_VERSION returned %d.%d\n"	\
 					     "The required version is %d.%d\n",	\
 					     version >> SPCI_VERSION_MAJOR_SHIFT,\