diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function
index 767e44102..ddb9576e3 100644
--- a/tests/suites/test_suite_cipher.function
+++ b/tests/suites/test_suite_cipher.function
@@ -485,8 +485,8 @@ void decrypt_test_vec( int cipher_id, int pad_mode, HexParam_t * key,
     memset( output, 0x00, sizeof( output ) );
 
 #if !defined(MBEDTLS_GCM_C) && !defined(MBEDTLS_CHACHAPOLY_C)
-    ((void) hex_ad);
-    ((void) hex_tag);
+    ((void) ad);
+    ((void) tag);
 #endif
 
     /* Prepare context */
diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index f9ba57623..c00b1aca8 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -1,4 +1,5 @@
 /* BEGIN_HEADER */
+#include "mbedtls/bignum.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/x509_csr.h"
 #include "mbedtls/pem.h"