Merge "feat(rmm): add tests for FEAT_TCR2 on RMM"
diff --git a/tftf/tests/runtime_services/host_realm_managment/host_crypto_utils.c b/tftf/tests/runtime_services/host_realm_managment/host_crypto_utils.c
index 80834fa..8e79f8e 100644
--- a/tftf/tests/runtime_services/host_realm_managment/host_crypto_utils.c
+++ b/tftf/tests/runtime_services/host_realm_managment/host_crypto_utils.c
@@ -7,6 +7,7 @@
 #include <string.h>
 #include <stdbool.h>
 
+#include <common_def.h>
 #ifdef MBEDTLS_CONFIG_FILE
 #include <mbedtls/asn1.h>
 #include <mbedtls/bignum.h>
diff --git a/tftf/tests/tests-realm-payload.mk b/tftf/tests/tests-realm-payload.mk
index fc3524e..8099d18 100644
--- a/tftf/tests/tests-realm-payload.mk
+++ b/tftf/tests/tests-realm-payload.mk
@@ -64,6 +64,7 @@
 		pcie_doe.c	\
 	)
 
+ifeq (${ENABLE_REALM_PAYLOAD_TEST},1)
 include lib/ext_mbedtls/mbedtls.mk
-
+endif
 endif