diff --git a/src/transports/sentry_disk_transport.c b/src/transports/sentry_disk_transport.c
index 2ccf448d6..3f0d03329 100644
--- a/src/transports/sentry_disk_transport.c
+++ b/src/transports/sentry_disk_transport.c
@@ -7,7 +7,7 @@
 #include "sentry_string.h"
 
 static void
-send_envelope(sentry_envelope_t *envelope, void *state)
+send_envelope_disk_transport(sentry_envelope_t *envelope, void *state)
 {
     const sentry_run_t *run = state;
 
@@ -18,7 +18,8 @@ send_envelope(sentry_envelope_t *envelope, void *state)
 sentry_transport_t *
 sentry_new_disk_transport(const sentry_run_t *run)
 {
-    sentry_transport_t *transport = sentry_transport_new(send_envelope);
+    sentry_transport_t *transport
+        = sentry_transport_new(send_envelope_disk_transport);
     if (!transport) {
         return NULL;
     }
diff --git a/src/transports/sentry_function_transport.c b/src/transports/sentry_function_transport.c
index d51e29e05..57aa14db2 100644
--- a/src/transports/sentry_function_transport.c
+++ b/src/transports/sentry_function_transport.c
@@ -10,7 +10,7 @@ struct transport_state {
 };
 
 static void
-send_envelope(sentry_envelope_t *envelope, void *_state)
+send_envelope_function_transport(sentry_envelope_t *envelope, void *_state)
 {
     struct transport_state *state = _state;
     state->func(envelope, state->data);
@@ -29,7 +29,8 @@ sentry_new_function_transport(
     state->func = func;
     state->data = data;
 
-    sentry_transport_t *transport = sentry_transport_new(send_envelope);
+    sentry_transport_t *transport
+        = sentry_transport_new(send_envelope_function_transport);
     if (!transport) {
         sentry_free(state);
         return NULL;
diff --git a/tests/unit/main.c b/tests/unit/main.c
index e38f4d16f..fb351549f 100644
--- a/tests/unit/main.c
+++ b/tests/unit/main.c
@@ -2,7 +2,7 @@
 
 #include "sentry_testsupport.h"
 
-#define XX(Name) void CONCAT(test_sentry_, Name)(void);
+#define XX(Name) SENTRY_TEST(Name);
 #include "tests.inc"
 #undef XX
 
diff --git a/tests/unit/sentry_testsupport.h b/tests/unit/sentry_testsupport.h
index 0a7b1f518..81927db1b 100644
--- a/tests/unit/sentry_testsupport.h
+++ b/tests/unit/sentry_testsupport.h
@@ -13,7 +13,7 @@
 #include "../vendor/acutest.h"
 
 #define CONCAT(A, B) A##B
-#define SENTRY_TEST(Name) void CONCAT(test_sentry_, Name)(void **UNUSED(state))
+#define SENTRY_TEST(Name) void CONCAT(test_sentry_, Name)(void)
 #define SKIP_TEST() (void)0
 
 #define TEST_CHECK_STRING_EQUAL(Val, ReferenceVal)                             \
diff --git a/tests/unit/test_attachments.c b/tests/unit/test_attachments.c
index de22327a9..4b3a6bbdd 100644
--- a/tests/unit/test_attachments.c
+++ b/tests/unit/test_attachments.c
@@ -10,7 +10,7 @@ typedef struct {
 } sentry_attachments_testdata_t;
 
 static void
-send_envelope(const sentry_envelope_t *envelope, void *_data)
+send_envelope_test_attachments(const sentry_envelope_t *envelope, void *_data)
 {
     sentry_attachments_testdata_t *data = _data;
     data->called += 1;
@@ -33,8 +33,9 @@ SENTRY_TEST(lazy_attachments)
     sentry_options_t *options = sentry_options_new();
     sentry_options_set_auto_session_tracking(options, false);
     sentry_options_set_dsn(options, "https://foo@sentry.invalid/42");
-    sentry_options_set_transport(
-        options, sentry_new_function_transport(send_envelope, &testdata));
+    sentry_options_set_transport(options,
+        sentry_new_function_transport(
+            send_envelope_test_attachments, &testdata));
     sentry_options_set_release(options, "prod");
 
     sentry_options_add_attachment(options, PREFIX ".existing-file-attachment");
diff --git a/tests/unit/test_basic.c b/tests/unit/test_basic.c
index 0f68b2165..342ef0037 100644
--- a/tests/unit/test_basic.c
+++ b/tests/unit/test_basic.c
@@ -3,7 +3,7 @@
 #include <sentry.h>
 
 static void
-send_envelope(const sentry_envelope_t *envelope, void *data)
+send_envelope_test_basic(const sentry_envelope_t *envelope, void *data)
 {
     uint64_t *called = data;
     *called += 1;
@@ -33,8 +33,8 @@ SENTRY_TEST(basic_function_transport)
 
     sentry_options_t *options = sentry_options_new();
     sentry_options_set_dsn(options, "https://foo@sentry.invalid/42");
-    sentry_options_set_transport(
-        options, sentry_new_function_transport(send_envelope, &called));
+    sentry_options_set_transport(options,
+        sentry_new_function_transport(send_envelope_test_basic, &called));
     sentry_options_set_release(options, "prod");
     sentry_options_set_require_user_consent(options, true);
     sentry_init(options);
@@ -80,7 +80,8 @@ SENTRY_TEST(sampling_before_send)
     sentry_options_t *options = sentry_options_new();
     sentry_options_set_dsn(options, "https://foo@sentry.invalid/42");
     sentry_options_set_transport(options,
-        sentry_new_function_transport(send_envelope, &called_transport));
+        sentry_new_function_transport(
+            send_envelope_test_basic, &called_transport));
     sentry_options_set_before_send(options, before_send, &called_beforesend);
     sentry_options_set_sample_rate(options, 0.75);
     sentry_init(options);