diff --git a/library/aead_chacha20_poly1305.c b/library/aead_chacha20_poly1305.c
index 3aa8d637d..dac96ae34 100644
--- a/library/aead_chacha20_poly1305.c
+++ b/library/aead_chacha20_poly1305.c
@@ -430,7 +430,7 @@ int mbedtls_aead_chacha20_poly1305_self_test( int verbose )
     {
         if ( verbose != 0 )
         {
-            mbedtls_printf( "  ChaCha20-Poly1305 test %zi ", i );
+            mbedtls_printf( "  ChaCha20-Poly1305 test %zu ", i );
         }
 
         result = mbedtls_aead_chacha20_poly1305_crypt_and_mac( test_key[i],
diff --git a/library/chacha20.c b/library/chacha20.c
index f3ddd9b96..437e38069 100644
--- a/library/chacha20.c
+++ b/library/chacha20.c
@@ -561,7 +561,7 @@ int mbedtls_chacha20_self_test( int verbose )
     {
         if ( verbose != 0 )
         {
-            mbedtls_printf( "  ChaCha20 test %zi ", i );
+            mbedtls_printf( "  ChaCha20 test %zu ", i );
         }
 
         result = mbedtls_chacha20_crypt( test_keys[i],
diff --git a/library/poly1305.c b/library/poly1305.c
index d7c9ce160..004d8574a 100644
--- a/library/poly1305.c
+++ b/library/poly1305.c
@@ -492,7 +492,7 @@ int mbedtls_poly1305_self_test( int verbose )
     {
         if ( verbose != 0 )
         {
-            mbedtls_printf( "  Poly1305 test %zi ", i );
+            mbedtls_printf( "  Poly1305 test %zu ", i );
         }
 
         result = mbedtls_poly1305_mac( test_keys[i],