diff --git a/tests_reg/test/secure_fw/suites/attestation/non_secure/attest_asymmetric_ns_interface_testsuite.c b/tests_reg/test/secure_fw/suites/attestation/non_secure/attest_asymmetric_ns_interface_testsuite.c
index e6baaf6..a0e0d06 100644
--- a/tests_reg/test/secure_fw/suites/attestation/non_secure/attest_asymmetric_ns_interface_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/attestation/non_secure/attest_asymmetric_ns_interface_testsuite.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <assert.h>
 #include "attest_ns_tests.h"
 #include "psa/initial_attestation.h"
 #include "attest.h"
@@ -108,6 +109,8 @@
         return;
     }
 
+    assert(sizeof(token_buffer) >= token_size);
+
     /* Call with smaller buffer size than size of the expected token */
     err = psa_initial_attest_get_token(challenge_buffer,
                                        sizeof(challenge_buffer),
diff --git a/tests_reg/test/secure_fw/suites/attestation/non_secure/attest_symmetric_ns_interface_testsuite.c b/tests_reg/test/secure_fw/suites/attestation/non_secure/attest_symmetric_ns_interface_testsuite.c
index 3d0f62a..fd37ec9 100644
--- a/tests_reg/test/secure_fw/suites/attestation/non_secure/attest_symmetric_ns_interface_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/attestation/non_secure/attest_symmetric_ns_interface_testsuite.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <assert.h>
 #include "attest_ns_tests.h"
 #include "psa/initial_attestation.h"
 #include "attest.h"
@@ -98,6 +99,8 @@
         return;
     }
 
+    assert(sizeof(token_buffer) >= token_size);
+
     /* Call with smaller buffer size than size of the expected token */
     err = psa_initial_attest_get_token(challenge_buffer,
                                        sizeof(challenge_buffer),
diff --git a/tests_reg/test/secure_fw/suites/attestation/secure/attest_asymmetric_s_interface_testsuite.c b/tests_reg/test/secure_fw/suites/attestation/secure/attest_asymmetric_s_interface_testsuite.c
index 52aa2a5..e0d2eb1 100644
--- a/tests_reg/test/secure_fw/suites/attestation/secure/attest_asymmetric_s_interface_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/attestation/secure/attest_asymmetric_s_interface_testsuite.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <assert.h>
 #include "attest_s_tests.h"
 #include "psa/initial_attestation.h"
 #include "../attest_tests_common.h"
@@ -106,6 +107,8 @@
         return;
     }
 
+    assert(sizeof(token_buffer) >= token_size);
+
     /* Call with smaller buffer size than size of the expected token */
     err = psa_initial_attest_get_token(challenge_buffer,
                                        sizeof(challenge_buffer),
diff --git a/tests_reg/test/secure_fw/suites/attestation/secure/attest_symmetric_s_interface_testsuite.c b/tests_reg/test/secure_fw/suites/attestation/secure/attest_symmetric_s_interface_testsuite.c
index 6ed09d5..f28dc73 100644
--- a/tests_reg/test/secure_fw/suites/attestation/secure/attest_symmetric_s_interface_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/attestation/secure/attest_symmetric_s_interface_testsuite.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <assert.h>
 #include "attest_s_tests.h"
 #include "psa/initial_attestation.h"
 #include "attest.h"
@@ -98,6 +99,8 @@
         return;
     }
 
+    assert(sizeof(token_buffer) >= token_size);
+
     /* Call with smaller buffer size than size of the expected token */
     err = psa_initial_attest_get_token(challenge_buffer,
                                        sizeof(challenge_buffer),