diff --git a/tests/include/tests/isc.h b/tests/include/tests/isc.h
index bb4e0b99e9..f7056a4003 100644
--- a/tests/include/tests/isc.h
+++ b/tests/include/tests/isc.h
@@ -100,7 +100,7 @@ file_path_to_groupname(const char *path, char *out, size_t outlen);
 	int setup_test_##name(void **state ISC_ATTR_UNUSED);
 
 #define ISC_RUN_TEST_DECLARE(name) \
-	void run_test_##name(void **state ISC_ATTR_UNUSED);
+	static void run_test_##name(void **state ISC_ATTR_UNUSED);
 
 #define ISC_TEARDOWN_TEST_DECLARE(name) \
 	int teardown_test_##name(void **state ISC_ATTR_UNUSED)
@@ -129,9 +129,9 @@ file_path_to_groupname(const char *path, char *out, size_t outlen);
 	int setup_test_##name(void **state ISC_ATTR_UNUSED); \
 	int setup_test_##name(void **state ISC_ATTR_UNUSED)
 
-#define ISC_RUN_TEST_IMPL(name)                             \
-	void run_test_##name(void **state ISC_ATTR_UNUSED); \
-	void run_test_##name(void **state ISC_ATTR_UNUSED)
+#define ISC_RUN_TEST_IMPL(name)                                    \
+	static void run_test_##name(void **state ISC_ATTR_UNUSED); \
+	static void run_test_##name(void **state ISC_ATTR_UNUSED)
 
 #define ISC_TEARDOWN_TEST_IMPL(name)                            \
 	int teardown_test_##name(void **state ISC_ATTR_UNUSED); \
@@ -143,9 +143,9 @@ file_path_to_groupname(const char *path, char *out, size_t outlen);
 	;
 
 #define ISC_LOOP_TEST_CUSTOM_IMPL(name, setup, teardown)                    \
-	void run_test_##name(void **state ISC_ATTR_UNUSED);                 \
-	void loop_test_##name(void *arg ISC_ATTR_UNUSED);                   \
-	void run_test_##name(void **state ISC_ATTR_UNUSED) {                \
+	static void run_test_##name(void **state ISC_ATTR_UNUSED);          \
+	static void loop_test_##name(void *arg ISC_ATTR_UNUSED);            \
+	static void run_test_##name(void **state ISC_ATTR_UNUSED) {         \
 		isc_job_cb setup_loop = setup;                              \
 		isc_job_cb teardown_loop = teardown;                        \
 		if (setup_loop != NULL) {                                   \
@@ -158,7 +158,7 @@ file_path_to_groupname(const char *path, char *out, size_t outlen);
 		isc_loop_setup(isc_loop_main(), loop_test_##name, state);   \
 		isc_loopmgr_run();                                          \
 	}                                                                   \
-	void loop_test_##name(void *arg ISC_ATTR_UNUSED)
+	static void loop_test_##name(void *arg ISC_ATTR_UNUSED)
 
 #define ISC_LOOP_TEST_IMPL(name) ISC_LOOP_TEST_CUSTOM_IMPL(name, NULL, NULL)
 
diff --git a/tests/isc/mutex_test.c b/tests/isc/mutex_test.c
index 44c4b0ef29..3310863479 100644
--- a/tests/isc/mutex_test.c
+++ b/tests/isc/mutex_test.c
@@ -80,10 +80,11 @@ ISC_RUN_TEST_IMPL(isc_mutex) {
 #define CNT_MIN 800
 #define CNT_MAX 1600
 
-static size_t shared_counter = 0;
-static size_t expected_counter = SIZE_MAX;
+#if !defined(__SANITIZE_THREAD__)
 static isc_mutex_t lock;
 static pthread_mutex_t mutex;
+static size_t expected_counter = SIZE_MAX;
+static size_t shared_counter = 0;
 
 static void *
 pthread_mutex_thread(void *arg) {
@@ -209,6 +210,7 @@ ISC_RUN_TEST_IMPL(isc_mutex_benchmark) {
 
 	isc_mem_cput(isc_g_mctx, threads, workers, sizeof(*threads));
 }
+#endif
 
 ISC_TEST_LIST_START
 
diff --git a/tests/isc/rwlock_test.c b/tests/isc/rwlock_test.c
index a26334c92a..e193936d52 100644
--- a/tests/isc/rwlock_test.c
+++ b/tests/isc/rwlock_test.c
@@ -55,9 +55,11 @@ static isc_barrier_t barrier2;
 #define CNT_MIN 800
 #define CNT_MAX 1600
 
+#if !defined(__SANITIZE_THREAD__)
 static size_t shared_counter = 0;
 static size_t expected_counter = SIZE_MAX;
 static uint8_t boundary = 0;
+#endif
 static uint8_t *rnd;
 
 static int
@@ -136,6 +138,7 @@ ISC_RUN_TEST_IMPL(isc_rwlock_wrlock) {
 /*
  * Simple single-threaded lock/tryupgrade/unlock test
  */
+#if !defined(__SANITIZE_THREAD__)
 ISC_RUN_TEST_IMPL(isc_rwlock_tryupgrade) {
 	isc_result_t result;
 	isc_rwlock_lock(&rwlock, isc_rwlocktype_read);
@@ -347,6 +350,7 @@ ISC_RUN_TEST_IMPL(isc_rwlock_benchmark) {
 
 	isc_mem_cput(isc_g_mctx, threads, workers, sizeof(*threads));
 }
+#endif
 
 ISC_TEST_LIST_START
 
diff --git a/tests/isc/spinlock_test.c b/tests/isc/spinlock_test.c
index bd9fc37d0d..fbaeeee74b 100644
--- a/tests/isc/spinlock_test.c
+++ b/tests/isc/spinlock_test.c
@@ -86,6 +86,7 @@ ISC_RUN_TEST_IMPL(isc_spinlock) {
 #define CNT_MIN 800
 #define CNT_MAX 1600
 
+#if !defined(__SANITIZE_THREAD__)
 static size_t shared_counter = 0;
 static size_t expected_counter = SIZE_MAX;
 
@@ -220,6 +221,7 @@ ISC_RUN_TEST_IMPL(isc_spinlock_benchmark) {
 
 	isc_mem_cput(isc_g_mctx, threads, workers, sizeof(*threads));
 }
+#endif
 
 ISC_TEST_LIST_START