diff --git a/test/ringbuffer-test-utils.c b/test/ringbuffer-test-utils.c
index fff4325..3b3a4a9 100644
--- a/test/ringbuffer-test-utils.c
+++ b/test/ringbuffer-test-utils.c
@@ -33,7 +33,8 @@
 						    size_t force_len)
 {
 	struct rb_test_ctx *ctx = data;
-	size_t len, total_len;
+	size_t len;
+	size_t total_len;
 	uint8_t *buf;
 
 	if (ctx->ignore_poll) {
diff --git a/test/test-ringbuffer-boundary-poll.c b/test/test-ringbuffer-boundary-poll.c
index aa8a350..4cd1c20 100644
--- a/test/test-ringbuffer-boundary-poll.c
+++ b/test/test-ringbuffer-boundary-poll.c
@@ -9,7 +9,8 @@
 void test_boundary_poll(void)
 {
 	uint8_t in_buf[] = { 'a', 'b', 'c', 'd', 'e', 'f' };
-	struct rb_test_ctx _ctx, *ctx = &_ctx;
+	struct rb_test_ctx _ctx;
+	struct rb_test_ctx *ctx = &_ctx;
 	struct ringbuffer *rb;
 	int rc;
 
diff --git a/test/test-ringbuffer-boundary-read.c b/test/test-ringbuffer-boundary-read.c
index f62f66f..2b7e4b4 100644
--- a/test/test-ringbuffer-boundary-read.c
+++ b/test/test-ringbuffer-boundary-read.c
@@ -8,10 +8,12 @@
 
 void test_boundary_read(void)
 {
-	uint8_t *out_buf, in_buf[] = { 'a', 'b', 'c', 'd', 'e', 'f' };
+	uint8_t *out_buf;
+	uint8_t in_buf[] = { 'a', 'b', 'c', 'd', 'e', 'f' };
 	struct ringbuffer_consumer *rbc;
 	struct ringbuffer *rb;
-	size_t len, pos;
+	size_t len;
+	size_t pos;
 	int rc;
 
 	static_assert(sizeof(in_buf) * 2 > 10, "");
diff --git a/test/test-ringbuffer-contained-offset-read.c b/test/test-ringbuffer-contained-offset-read.c
index 1fbe1cb..05484d2 100644
--- a/test/test-ringbuffer-contained-offset-read.c
+++ b/test/test-ringbuffer-contained-offset-read.c
@@ -8,7 +8,8 @@
 
 void test_contained_offset_read(void)
 {
-	uint8_t *out_buf, in_buf[] = { 'a', 'b', 'c' };
+	uint8_t *out_buf;
+	uint8_t in_buf[] = { 'a', 'b', 'c' };
 	struct ringbuffer_consumer *rbc;
 	struct ringbuffer *rb;
 	size_t len;
diff --git a/test/test-ringbuffer-contained-read.c b/test/test-ringbuffer-contained-read.c
index 37df3cf..96018c4 100644
--- a/test/test-ringbuffer-contained-read.c
+++ b/test/test-ringbuffer-contained-read.c
@@ -8,7 +8,8 @@
 
 void test_contained_read(void)
 {
-	uint8_t *out_buf, in_buf[] = { 'a', 'b', 'c' };
+	uint8_t *out_buf;
+	uint8_t in_buf[] = { 'a', 'b', 'c' };
 	struct ringbuffer_consumer *rbc;
 	struct ringbuffer *rb;
 	size_t len;
diff --git a/test/test-ringbuffer-poll-force.c b/test/test-ringbuffer-poll-force.c
index e1e4245..34cc348 100644
--- a/test/test-ringbuffer-poll-force.c
+++ b/test/test-ringbuffer-poll-force.c
@@ -11,7 +11,8 @@
 	uint8_t in_buf[] = {
 		'a', 'b', 'c', 'd', 'e', 'f',
 	};
-	struct rb_test_ctx _ctx, *ctx = &_ctx;
+	struct rb_test_ctx _ctx;
+	struct rb_test_ctx *ctx = &_ctx;
 	struct ringbuffer *rb;
 	int rc;
 
diff --git a/test/test-ringbuffer-read-commit.c b/test/test-ringbuffer-read-commit.c
index 0dba0d7..9173b9f 100644
--- a/test/test-ringbuffer-read-commit.c
+++ b/test/test-ringbuffer-read-commit.c
@@ -8,7 +8,8 @@
 
 void test_read_commit(void)
 {
-	uint8_t *out_buf, in_buf[] = {
+	uint8_t *out_buf;
+	uint8_t in_buf[] = {
 		'a',
 		'b',
 		'c',
diff --git a/test/test-ringbuffer-simple-poll.c b/test/test-ringbuffer-simple-poll.c
index 89a9477..d94e5db 100644
--- a/test/test-ringbuffer-simple-poll.c
+++ b/test/test-ringbuffer-simple-poll.c
@@ -9,7 +9,8 @@
 void test_simple_poll(void)
 {
 	uint8_t in_buf[] = { 'a', 'b', 'c' };
-	struct rb_test_ctx _ctx, *ctx;
+	struct rb_test_ctx _ctx;
+	struct rb_test_ctx *ctx;
 	struct ringbuffer *rb;
 	int rc;