diff --git a/tests/suites/test_suite_cmac.function b/tests/suites/test_suite_cmac.function
index 7bae762e9..08ee207ee 100644
--- a/tests/suites/test_suite_cmac.function
+++ b/tests/suites/test_suite_cmac.function
@@ -122,11 +122,11 @@ void mbedtls_cmac_setkey( int cipher_type, int key_size, int result )
 void mbedtls_cmac_multiple_blocks( int cipher_type, uint8_t * key,
                                    uint32_t key_len, int keybits,
                                    int block_size, uint8_t * block1,
-                                   uint32_t block1_len, int block1_len,
-                                   uint8_t * block2, uint32_t block2_len,
+                                   uint32_t block1_sz, int block1_len,
+                                   uint8_t * block2, uint32_t block2_sz,
                                    int block2_len, uint8_t * block3,
-                                   uint32_t block3_len, int block3_len,
-                                   uint8_t * block4, uint32_t block4_len,
+                                   uint32_t block3_sz, int block3_len,
+                                   uint8_t * block4, uint32_t block4_sz,
                                    int block4_len, uint8_t * expected_result,
                                    uint32_t expected_result_len )
 {
@@ -191,24 +191,24 @@ void mbedtls_cmac_multiple_operations_same_key( int cipher_type,
                                                 uint32_t key_len, int keybits,
                                                 int block_size,
                                                 uint8_t * block_a1,
-                                                uint32_t block_a1_len,
+                                                uint32_t block_a1_sz,
                                                 int block_a1_len,
                                                 uint8_t * block_a2,
-                                                uint32_t block_a2_len,
+                                                uint32_t block_a2_sz,
                                                 int block_a2_len,
                                                 uint8_t * block_a3,
-                                                uint32_t block_a3_len,
+                                                uint32_t block_a3_sz,
                                                 int block_a3_len,
                                                 uint8_t * expected_result_a,
                                                 uint32_t expected_result_a_len,
                                                 uint8_t * block_b1,
-                                                uint32_t block_b1_len,
+                                                uint32_t block_b1_sz,
                                                 int block_b1_len,
                                                 uint8_t * block_b2,
-                                                uint32_t block_b2_len,
+                                                uint32_t block_b2_sz,
                                                 int block_b2_len,
                                                 uint8_t * block_b3,
-                                                uint32_t block_b3_len,
+                                                uint32_t block_b3_sz,
                                                 int block_b3_len,
                                                 uint8_t * expected_result_b,
                                                 uint32_t expected_result_b_len