diff --git a/test/default/aead_aes256gcm.c b/test/default/aead_aes256gcm.c
index 6c29c953..07fadf47 100644
--- a/test/default/aead_aes256gcm.c
+++ b/test/default/aead_aes256gcm.c
@@ -3076,7 +3076,7 @@ static struct {
     }
 };
 
-int
+static int
 tv(void)
 {
     unsigned char      *ad;
diff --git a/test/default/core6.c b/test/default/core6.c
index 3c183df7..a71b3f2c 100644
--- a/test/default/core6.c
+++ b/test/default/core6.c
@@ -17,7 +17,7 @@ static unsigned char c[16]
 
 static unsigned char out[64];
 
-void print(unsigned char *x, unsigned char *y)
+static void print(unsigned char *x, unsigned char *y)
 {
     int i;
     unsigned int borrow = 0;
diff --git a/test/default/generichash.c b/test/default/generichash.c
index 4e52ee5e..507d4e0c 100644
--- a/test/default/generichash.c
+++ b/test/default/generichash.c
@@ -1291,7 +1291,7 @@ static struct {
     }
 };
 
-int
+static int
 tv(void)
 {
     unsigned char *expected_out;
diff --git a/test/default/sodium_utils2.c b/test/default/sodium_utils2.c
index 606b9b0c..d6dc8005 100644
--- a/test/default/sodium_utils2.c
+++ b/test/default/sodium_utils2.c
@@ -12,7 +12,7 @@
 # warning The sodium_utils2 test is expected to fail with address sanitizer
 #endif
 
-static void segv_handler(int sig)
+__attribute__ ((noreturn)) static void segv_handler(int sig)
 {
     (void) sig;
 
diff --git a/test/default/sodium_utils3.c b/test/default/sodium_utils3.c
index c663ae1e..603cf757 100644
--- a/test/default/sodium_utils3.c
+++ b/test/default/sodium_utils3.c
@@ -12,7 +12,7 @@
 # warning The sodium_utils3 test is expected to fail with address sanitizer
 #endif
 
-static void segv_handler(int sig)
+__attribute__ ((noreturn)) static void segv_handler(int sig)
 {
     (void) sig;