diff --git a/tests/bgpd/test_bgp_table.c b/tests/bgpd/test_bgp_table.c
index 01ce7480d7..a0382827b9 100644
--- a/tests/bgpd/test_bgp_table.c
+++ b/tests/bgpd/test_bgp_table.c
@@ -116,8 +116,8 @@ static void check_lookup_result(struct list *list, va_list arglist)
 	assert(prefix_count == listcount(list));
 }
 
-static void do_test(struct bgp_table *table, const char *prefix, uint8_t maxlen,
-		    ...)
+static void do_test(struct bgp_table *table, const char *prefix,
+		    uint32_t maxlen, ...)
 {
 	va_list arglist;
 	struct list *list = list_new();
diff --git a/tests/bgpd/test_capability.c b/tests/bgpd/test_capability.c
index c75a699a16..4612bdc26b 100644
--- a/tests/bgpd/test_capability.c
+++ b/tests/bgpd/test_capability.c
@@ -821,6 +821,7 @@ static void parse_test(struct peer *peer, struct test_segment *t, int type)
 	switch (type) {
 	case CAPABILITY:
 		len += 2; /* to cover the OPT-Param header */
+		__attribute__ ((fallthrough));
 	case OPT_PARAM:
 		printf("len: %u\n", len);
 		/* peek_for_as4 wants getp at capibility*/
diff --git a/tests/lib/test_srcdest_table.c b/tests/lib/test_srcdest_table.c
index 53180564bd..e717da15b3 100644
--- a/tests/lib/test_srcdest_table.c
+++ b/tests/lib/test_srcdest_table.c
@@ -392,7 +392,8 @@ static void test_state_del_one_route(struct test_state *test, struct prng *prng)
 	}
 
 	assert(rn);
-	srcdest_rnode_prefixes(rn, &dst_p, &src_p);
+	srcdest_rnode_prefixes(rn, (const struct prefix **)&dst_p,
+			       (const struct prefix **)&src_p);
 	memcpy(&dst6_p, dst_p, sizeof(dst6_p));
 	if (src_p)
 		memcpy(&src6_p, src_p, sizeof(src6_p));