diff --git a/test/default/aead_chacha20poly1305.c b/test/default/aead_chacha20poly1305.c
index c4a9dcb9..b6bf756d 100644
--- a/test/default/aead_chacha20poly1305.c
+++ b/test/default/aead_chacha20poly1305.c
@@ -21,10 +21,10 @@ tv(void)
         = { 0xcd, 0x7c, 0xf6, 0x7b, 0xe3, 0x9c, 0x79, 0x4a };
     static const unsigned char ad[ADLEN]
         = { 0x87, 0xe2, 0x29, 0xd4, 0x50, 0x08, 0x45, 0xa0, 0x79, 0xc0 };
-    unsigned char c[CLEN];
-    unsigned char detached_c[MLEN];
-    unsigned char mac[crypto_aead_chacha20poly1305_ABYTES];
-    unsigned char m2[MLEN];
+    unsigned char *c = sodium_malloc(CLEN);
+    unsigned char *detached_c = sodium_malloc(MLEN);
+    unsigned char *mac = sodium_malloc(crypto_aead_chacha20poly1305_ABYTES);
+    unsigned char *m2 = sodium_malloc(MLEN);
     unsigned long long found_clen;
     unsigned long long found_maclen;
     unsigned long long m2len;
@@ -150,6 +150,11 @@ tv(void)
         printf("m != c (adlen=0)\n");
     }
 
+    sodium_free(c);
+    sodium_free(detached_c);
+    sodium_free(mac);
+    sodium_free(m2);
+
     assert(crypto_aead_chacha20poly1305_keybytes() > 0U);
     assert(crypto_aead_chacha20poly1305_npubbytes() > 0U);
     assert(crypto_aead_chacha20poly1305_nsecbytes() == 0U);
@@ -165,7 +170,7 @@ tv_ietf(void)
 #undef  ADLEN
 #define ADLEN 12U
 #undef  CLEN
-#define CLEN (MLEN + crypto_aead_chacha20poly1305_ABYTES)
+#define CLEN (MLEN + crypto_aead_chacha20poly1305_ietf_ABYTES)
     static const unsigned char firstkey[crypto_aead_chacha20poly1305_ietf_KEYBYTES]
         = {
             0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
@@ -176,16 +181,16 @@ tv_ietf(void)
 #undef  MESSAGE
 #define MESSAGE "Ladies and Gentlemen of the class of '99: If I could offer you " \
 "only one tip for the future, sunscreen would be it."
-    unsigned char m[MLEN];
+    unsigned char *m = sodium_malloc(MLEN);
     static const unsigned char nonce[crypto_aead_chacha20poly1305_ietf_NPUBBYTES]
         = { 0x07, 0x00, 0x00, 0x00,
             0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47 };
     static const unsigned char ad[ADLEN]
         = { 0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7 };
-    unsigned char c[MLEN + crypto_aead_chacha20poly1305_ietf_ABYTES];
-    unsigned char detached_c[MLEN];
-    unsigned char mac[crypto_aead_chacha20poly1305_ietf_ABYTES];
-    unsigned char m2[MLEN];
+    unsigned char *c = sodium_malloc(CLEN);
+    unsigned char *detached_c = sodium_malloc(MLEN);
+    unsigned char *mac = sodium_malloc(crypto_aead_chacha20poly1305_ietf_ABYTES);
+    unsigned char *m2 = sodium_malloc(MLEN);
     unsigned long long found_clen;
     unsigned long long found_maclen;
     unsigned long long m2len;
@@ -311,6 +316,12 @@ tv_ietf(void)
         printf("m != c (adlen=0)\n");
     }
 
+    sodium_free(c);
+    sodium_free(detached_c);
+    sodium_free(mac);
+    sodium_free(m2);
+    sodium_free(m);
+
     assert(crypto_aead_chacha20poly1305_ietf_keybytes() > 0U);
     assert(crypto_aead_chacha20poly1305_ietf_keybytes() == crypto_aead_chacha20poly1305_keybytes());
     assert(crypto_aead_chacha20poly1305_ietf_npubbytes() > 0U);