diff --git a/crypto/crypto_entropy.c b/crypto/crypto_entropy.c
index c9023c2c..936e22ae 100644
--- a/crypto/crypto_entropy.c
+++ b/crypto/crypto_entropy.c
@@ -41,7 +41,8 @@ static void generate(uint8_t *, size_t);
 
 #ifdef CPUSUPPORT_X86_RDRAND
 static void
-update_from_rdrand(void) {
+update_from_rdrand(void)
+{
 	unsigned int buf[8];
 
 	/* This is only *extra* entropy, so it's ok if it fails. */
diff --git a/tests/aws/main.c b/tests/aws/main.c
index 6de9fb1f..32b1cc97 100644
--- a/tests/aws/main.c
+++ b/tests/aws/main.c
@@ -47,7 +47,7 @@ s3_headers(const char * key_id, const char * key_secret)
 }
 
 int
-main(int argc, char ** argv)
+main(int argc, char * argv[])
 {
 	const char * filename_bad = "/dev/null";
 	const char * filename_good = "format.key";
diff --git a/tests/elasticarray/elasticarray_perftest.c b/tests/elasticarray/elasticarray_perftest.c
index 7d1a37ec..f6da411a 100644
--- a/tests/elasticarray/elasticarray_perftest.c
+++ b/tests/elasticarray/elasticarray_perftest.c
@@ -14,14 +14,14 @@ ELASTICARRAY_DECL(INTLIST, intlist, int);
 #define BENCH_START						\
 	if (monoclock_get(&tv0)) {				\
 		warnp("monoclock");				\
-		goto err0;					\
+		goto err1;					\
 	}							\
 	for (i = 0; i < REPS; i++)
 
 #define BENCH_END(delta_ns)					\
 	if (monoclock_get(&tv1)) {				\
 		warnp("monoclock");				\
-		goto err0;					\
+		goto err1;					\
 	}							\
 	(delta_ns) = timeval_diff(tv0, tv1) * 1e9 / (double)REPS;
 
diff --git a/tests/getopt-longjmp/main.c b/tests/getopt-longjmp/main.c
index 0beb2f86..7902042d 100644
--- a/tests/getopt-longjmp/main.c
+++ b/tests/getopt-longjmp/main.c
@@ -10,7 +10,7 @@ enum E {
 
 /* Error on Solaris 11.4 with gcc 7.3.0 -O1. */
 static int
-getopt_int(int argc, char ** argv)
+getopt_int(int argc, char * argv[])
 {
 	/* Command-line arguments. */
 	int a = 0;
@@ -84,7 +84,7 @@ getopt_int_int(int argc, char * argv[])
  * an error on Debian buster-i386 with clang-7.0.1 -O1 and O2.
  */
 static int
-getopt_int_int_enum(int argc, char ** argv)
+getopt_int_int_enum(int argc, char * argv[])
 {
 	/* Command-line arguments. */
 	int a = 0;