diff --git a/test/default/keygen.c b/test/default/keygen.c
index 8f6735f3..113b6f13 100644
--- a/test/default/keygen.c
+++ b/test/default/keygen.c
@@ -10,7 +10,7 @@ typedef struct KeygenTV_ {
 static void
 tv_keygen(void)
 {
-    const static KeygenTV tvs[] = {
+    static const KeygenTV tvs[] = {
         { crypto_auth_keygen, crypto_auth_KEYBYTES },
         { crypto_auth_hmacsha256_keygen, crypto_auth_hmacsha256_KEYBYTES },
         { crypto_aead_aes256gcm_keygen, crypto_aead_aes256gcm_KEYBYTES },
diff --git a/test/default/randombytes.c b/test/default/randombytes.c
index 0882cbea..83de344f 100644
--- a/test/default/randombytes.c
+++ b/test/default/randombytes.c
@@ -29,7 +29,7 @@ compat_tests(void)
 static int
 randombytes_tests(void)
 {
-    const static unsigned char seed[randombytes_SEEDBYTES] = {
+    static const unsigned char seed[randombytes_SEEDBYTES] = {
         0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
         0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
         0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
diff --git a/test/default/xchacha20.c b/test/default/xchacha20.c
index a845f872..c02c1bbd 100644
--- a/test/default/xchacha20.c
+++ b/test/default/xchacha20.c
@@ -11,7 +11,7 @@ typedef struct HChaCha20TV_ {
 static void
 tv_hchacha20(void)
 {
-    const static HChaCha20TV tvs[] = {
+    static const HChaCha20TV tvs[] = {
         { "24f11cce8a1b3d61e441561a696c1c1b7e173d084fd4812425435a8896a013dc", "d9660c5900ae19ddad28d6e06e45fe5e", "5966b3eec3bff1189f831f06afe4d4e3be97fa9235ec8c20d08acfbbb4e851e3" },
         { "80a5f6272031e18bb9bcd84f3385da65e7731b7039f13f5e3d475364cd4d42f7", "c0eccc384b44c88e92c57eb2d5ca4dfa", "6ed11741f724009a640a44fce7320954c46e18e0d7ae063bdbc8d7cf372709df" },
         { "cb1fc686c0eec11a89438b6f4013bf110e7171dace3297f3a657a309b3199629", "fcd49b93e5f8f299227e64d40dc864a3", "84b7e96937a1a0a406bb7162eeaad34308d49de60fd2f7ec9dc6a79cbab2ca34" },
@@ -83,7 +83,7 @@ typedef struct XChaCha20TV_ {
 static void
 tv_stream_xchacha20(void)
 {
-    const static XChaCha20TV tvs[] = {
+    static const XChaCha20TV tvs[] = {
         { "79c99798ac67300bbb2704c95c341e3245f3dcb21761b98e52ff45b24f304fc4", "b33ffd3096479bcfbc9aee49417688a0a2554f8d95389419", "c6e9758160083ac604ef90e712ce6e75d7797590744e0cf060f013739c" },
         { "ddf7784fee099612c40700862189d0397fcc4cc4b3cc02b5456b3a97d1186173", "a9a04491e7bf00c3ca91ac7c2d38a777d88993a7047dfcc4", "2f289d371f6f0abc3cb60d11d9b7b29adf6bc5ad843e8493e928448d" },
         { "3d12800e7b014e88d68a73f0a95b04b435719936feba60473f02a9e61ae60682", "56bed2599eac99fb27ebf4ffcb770a64772dec4d5849ea2d", "a2c3c1406f33c054a92760a8e0666b84f84fa3a618f0" },
@@ -171,7 +171,7 @@ typedef struct XChaCha20Poly1305TV_ {
 static void
 tv_secretbox_xchacha20poly1305(void)
 {
-    const static XChaCha20Poly1305TV tvs[] = {
+    static const XChaCha20Poly1305TV tvs[] = {
         { "065ff46a9dddb1ab047ee5914d6d575a828b8cc1f454b24e8cd0f57efdc49a34", "f83262646ce01293b9923a65a073df78c54b2e799cd6c4e5", "", "4c72340416339dcdea01b760db5adaf7" },
         { "d3c71d54e6b13506e07aa2e7b412a17a7a1f34df3d3148cd3f45b91ccaa5f4d9", "943b454a853aa514c63cf99b1e197bbb99da24b2e2d93e47", "76bd706e07741e713d90efdb34ad202067263f984942aae8bda159f30dfccc72200f8093520b85c5ad124ff7c8b2d920946e5cfff4b819abf84c7b35a6205ca72c9f8747c3044dd73fb4bebda1b476", "0384276f1cfa5c82c3e58f0f2acc1f821c6f526d2c19557cf8bd270fcde43fba1d88890663f7b2f5c6b1d7deccf5c91b4df5865dc55cc7e04d6793fc2db8f9e3b418f95cb796d67a7f3f7e097150cb607c435dacf82eac3d669866e5092ace" },
         { "9498fdb922e0596e32af7f8108def2068f5a32a5ac70bd33ade371701f3d98d0", "a0056f24be0d20106fe750e2ee3684d4457cbdcb3a74e566", "b1bc9cfedb340fb06a37eba80439189e48aa0cfd37020eec0afa09165af12864671b3fbddbbb20ac18f586f2f66d13b3ca40c9a7e21c4513a5d87a95319f8ca3c2151e2a1b8b86a35653e77f90b9e63d2a84be9b9603876a89d60fd708edcd64b41be1064b8ad1046553aaeb51dc70b8112c9915d94f2a5dad1e14e7009db6c703c843a4f64b77d44b179b9579ac497dac2d33", "4918790d46893fa3dca74d8abc57eef7fca2c6393d1beef5efa845ac20475db38d1a068debf4c5dbd8614eb072877c565dc52bd40941f0b590d2079a5028e426bf50bcbaadcbebf278bddceedc578a5e31379523dee15026ec82d34e56f2871fdf13255db199ac48f163d5ee7e4f4e09a39451356959d9242a39aea33990ab960a4c25346e3d9397fc5e7cb6266c2476411cd331f2bcb4486750c746947ec6401865d5" },