diff --git a/include/common/test_helpers.h b/include/common/test_helpers.h
index c51c785..b1349dd 100644
--- a/include/common/test_helpers.h
+++ b/include/common/test_helpers.h
@@ -334,6 +334,15 @@
 		}								\
 	} while (false)
 
+#define SKIP_TEST_IF_RNG_TRAP_NOT_SUPPORTED()					\
+	do {									\
+		if (!is_feat_rng_trap_present()) {				\
+			tftf_testcase_printf("ARMv8.5-RNG_TRAP not"		\
+ 					"supported\n");				\
+			return TEST_RESULT_SKIPPED;				\
+		}								\
+	} while (false)
+
 /* Helper macro to verify if system suspend API is supported */
 #define is_psci_sys_susp_supported()	\
 		(tftf_get_psci_feature_info(SMC_PSCI_SYSTEM_SUSPEND)		\