diff --git a/raid/int.c b/raid/int.c
index b2b5ed25..f018745e 100644
--- a/raid/int.c
+++ b/raid/int.c
@@ -535,9 +535,9 @@ void raid_rec2_int8(int nr, int *id, int *ip, int nd, size_t size, void **vv)
 	uint8_t *q;
 	uint8_t *qa;
 	const int N = 2;
-	const uint8_t *T[N][N];
-	uint8_t G[N * N];
-	uint8_t V[N * N];
+	const uint8_t *T[2][2];
+	uint8_t G[2 * 2];
+	uint8_t V[2 * 2];
 	size_t i;
 	int j, k;
 
diff --git a/raid/module.c b/raid/module.c
index c7355f8d..c6d39497 100644
--- a/raid/module.c
+++ b/raid/module.c
@@ -456,7 +456,7 @@ int raid_selftest(void)
 	const int nv = nd + RAID_PARITY_MAX * 2 + 1;
 	void *v_alloc;
 	void **v;
-	void *ref[nd + RAID_PARITY_MAX];
+	void *ref[TEST_COUNT + RAID_PARITY_MAX];
 	int ir[RAID_PARITY_MAX];
 	int ip[RAID_PARITY_MAX];
 	int i, np;
diff --git a/raid/neon.c b/raid/neon.c
index 3a2b2219..89129e8f 100644
--- a/raid/neon.c
+++ b/raid/neon.c
@@ -627,10 +627,10 @@ void raid_rec2_neon(int nr, int *id, int *ip, int nd, size_t size, void **vv)
 {
 	uint8_t **v = (uint8_t **)vv;
 	const int N = 2;
-	uint8_t *p[N];
-	uint8_t *pa[N];
-	uint8_t G[N * N];
-	uint8_t V[N * N];
+	uint8_t *p[2];
+	uint8_t *pa[2];
+	uint8_t G[2 * 2];
+	uint8_t V[2 * 2];
 	size_t i;
 	int j, k;