diff --git a/lib/isc/tests/Makefile.am b/lib/isc/tests/Makefile.am
index 05b97487b7..1cee32d754 100644
--- a/lib/isc/tests/Makefile.am
+++ b/lib/isc/tests/Makefile.am
@@ -9,7 +9,7 @@ LDADD +=			\
 	$(LIBISC_LIBS)
 
 check_LTLIBRARIES = libisctest.la
-libisctest_la_SOURCES = 	\
+libisctest_la_SOURCES =		\
 	../unix/socket_p.h	\
 	isctest.c		\
 	isctest.h		\
@@ -31,6 +31,7 @@ TESTS =			\
 	md_test		\
 	mem_test	\
 	netaddr_test	\
+	netmgr_test	\
 	parse_test	\
 	pool_test	\
 	quota_test	\
@@ -45,13 +46,8 @@ TESTS =			\
 	symtab_test	\
 	task_test	\
 	taskpool_test	\
-	tcp_quota_test	\
-	tcp_test	\
-	tcpdns_test	\
 	time_test	\
-	timer_test	\
-	tlsdns_test	\
-	udp_test
+	timer_test
 
 check_PROGRAMS =	\
 	$(TESTS)
@@ -86,48 +82,12 @@ random_test_LDADD =	\
 	$(LDADD)	\
 	-lm
 
-tcp_test_CPPFLAGS =	\
+netmgr_test_CPPFLAGS =	\
 	$(AM_CPPFLAGS)	\
 	$(LIBUV_CFLAGS)	\
 	$(OPENSSL_CFLAGS)
 
-tcp_test_LDADD =	\
-	$(LDADD)	\
-	$(LIBUV_LIBS)
-
-tcp_quota_test_CPPFLAGS =	\
-	$(AM_CPPFLAGS)		\
-	$(LIBUV_CFLAGS)		\
-	$(OPENSSL_CFLAGS)
-
-tcp_quota_test_LDADD =	\
-	$(LDADD)	\
-	$(LIBUV_LIBS)
-
-tcpdns_test_CPPFLAGS =	\
-	$(AM_CPPFLAGS)	\
-	$(LIBUV_CFLAGS)	\
-	$(OPENSSL_CFLAGS)
-
-tcpdns_test_LDADD =	\
-	$(LDADD)	\
-	$(LIBUV_LIBS)
-
-tlsdns_test_CPPFLAGS =	\
-	$(AM_CPPFLAGS)	\
-	$(LIBUV_CFLAGS)	\
-	$(OPENSSL_CFLAGS)
-
-tlsdns_test_LDADD =	\
-	$(LDADD)	\
-	$(LIBUV_LIBS)
-
-udp_test_CPPFLAGS =	\
-	$(AM_CPPFLAGS)	\
-	$(LIBUV_CFLAGS)	\
-	$(OPENSSL_CFLAGS)
-
-udp_test_LDADD =	\
+netmgr_test_LDADD =	\
 	$(LDADD)	\
 	$(LIBUV_LIBS)
 
diff --git a/lib/isc/tests/isctest.c b/lib/isc/tests/isctest.c
index bf33660f98..a076dcfc3c 100644
--- a/lib/isc/tests/isctest.c
+++ b/lib/isc/tests/isctest.c
@@ -85,8 +85,9 @@ create_managers(unsigned int workers) {
 	if (p != NULL) {
 		workers = atoi(p);
 	}
+	INSIST(workers != 0);
 
-	isc_hp_init(ISC_MAX(ISC_MIN(workers, 256), 128));
+	isc_hp_init(4 * workers);
 
 	netmgr = isc_nm_start(test_mctx, workers);
 	CHECK(isc_taskmgr_create(test_mctx, workers, 0, netmgr, &taskmgr));
diff --git a/lib/isc/tests/netmgr_test.c b/lib/isc/tests/netmgr_test.c
new file mode 100644
index 0000000000..880c8bad1e
--- /dev/null
+++ b/lib/isc/tests/netmgr_test.c
@@ -0,0 +1,2499 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+#if HAVE_CMOCKA
+#include <sched.h> /* IWYU pragma: keep */
+#include <setjmp.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <uv.h>
+
+#define UNIT_TESTING
+#include <cmocka.h>
+
+#include <isc/hp.h>
+#include <isc/nonce.h>
+#include <isc/os.h>
+#include <isc/quota.h>
+#include <isc/refcount.h>
+#include <isc/sockaddr.h>
+#include <isc/thread.h>
+#include <isc/util.h>
+
+#include "uv_wrap.h"
+#define KEEP_BEFORE
+
+#include "../netmgr/netmgr-int.h"
+#include "../netmgr/udp.c"
+#include "../netmgr/uv-compat.c"
+#include "../netmgr/uv-compat.h"
+#include "isctest.h"
+
+isc_nm_t *listen_nm = NULL;
+isc_nm_t *connect_nm = NULL;
+
+static isc_sockaddr_t udp_listen_addr;
+static isc_sockaddr_t udp_connect_addr;
+
+static isc_sockaddr_t tcp_listen_addr;
+static isc_sockaddr_t tcp_connect_addr;
+static isc_tlsctx_t *tcp_listen_tlsctx = NULL;
+static isc_tlsctx_t *tcp_connect_tlsctx = NULL;
+
+static uint64_t send_magic = 0;
+static uint64_t stop_magic = 0;
+
+static uv_buf_t send_msg = { .base = (char *)&send_magic,
+			     .len = sizeof(send_magic) };
+
+static uv_buf_t stop_msg = { .base = (char *)&stop_magic,
+			     .len = sizeof(stop_magic) };
+
+static atomic_bool do_send = ATOMIC_VAR_INIT(false);
+static unsigned int workers = 1;
+
+static atomic_int_fast64_t nsends;
+static int_fast64_t esends; /* expected sends */
+
+static atomic_int_fast64_t ssends;
+static atomic_int_fast64_t sreads;
+static atomic_int_fast64_t saccepts;
+
+static atomic_int_fast64_t cconnects;
+static atomic_int_fast64_t csends;
+static atomic_int_fast64_t creads;
+
+static isc_refcount_t active_cconnects;
+static isc_refcount_t active_csends;
+static isc_refcount_t active_creads;
+static isc_refcount_t active_ssends;
+static isc_refcount_t active_sreads;
+
+static isc_quota_t listener_quota;
+static atomic_bool check_listener_quota;
+
+static bool skip_long_tests = false;
+
+#define SKIP_IN_CI             \
+	if (skip_long_tests) { \
+		skip();        \
+		return;        \
+	}
+
+#define NSENDS 100
+
+/* Timeouts in miliseconds */
+#define T_INIT	     120 * 1000
+#define T_IDLE	     120 * 1000
+#define T_KEEPALIVE  120 * 1000
+#define T_ADVERTISED 120 * 1000
+#define T_CONNECT    30 * 1000
+
+#define WAIT_REPEATS 100
+#define T_WAIT	     1000 /* In microseconds */
+
+#define WAIT_FOR(v, op, val)                                \
+	{                                                   \
+		X(v);                                       \
+		int_fast64_t __r = WAIT_REPEATS;            \
+		int_fast64_t __o = 0;                       \
+		do {                                        \
+			int_fast64_t __l = atomic_load(&v); \
+			if (__l op val) {                   \
+				break;                      \
+			};                                  \
+			if (__o == __l) {                   \
+				__r--;                      \
+			} else {                            \
+				__r = WAIT_REPEATS;         \
+			}                                   \
+			__o = __l;                          \
+			usleep(T_WAIT);                     \
+		} while (__r > 0);                          \
+		X(v);                                       \
+		P(__r);                                     \
+		assert_true(atomic_load(&v) op val);        \
+	}
+
+#define WAIT_FOR_EQ(v, val) WAIT_FOR(v, ==, val)
+#define WAIT_FOR_NE(v, val) WAIT_FOR(v, !=, val)
+#define WAIT_FOR_LE(v, val) WAIT_FOR(v, <=, val)
+#define WAIT_FOR_LT(v, val) WAIT_FOR(v, <, val)
+#define WAIT_FOR_GE(v, val) WAIT_FOR(v, >=, val)
+#define WAIT_FOR_GT(v, val) WAIT_FOR(v, >, val)
+
+#define DONE() atomic_store(&do_send, false);
+
+#define CHECK_RANGE_FULL(v)                \
+	{                                  \
+		int __v = atomic_load(&v); \
+		assert_true(__v > 1);      \
+	}
+
+#define CHECK_RANGE_HALF(v)                \
+	{                                  \
+		int __v = atomic_load(&v); \
+		assert_true(__v > 1);      \
+	}
+
+/* Enable this to print values while running tests */
+#undef PRINT_DEBUG
+#ifdef PRINT_DEBUG
+#define X(v)                                                               \
+	fprintf(stderr, "%s:%s:%d:%s = %" PRId64 "\n", __func__, __FILE__, \
+		__LINE__, #v, atomic_load(&v))
+#define P(v) fprintf(stderr, #v " = %" PRId64 "\n", v)
+#define F()                                                   \
+	fprintf(stderr, "%s(%p, %s, %p)\n", __func__, handle, \
+		isc_result_totext(eresult), cbarg)
+#else
+#define X(v)
+#define P(v)
+#define F()
+#endif
+
+#define atomic_assert_int_eq(val, exp) assert_int_equal(atomic_load(&val), exp)
+#define atomic_assert_int_ne(val, exp) \
+	assert_int_not_equal(atomic_load(&val), exp)
+#define atomic_assert_int_le(val, exp) assert_true(atomic_load(&val) <= exp)
+#define atomic_assert_int_lt(val, exp) assert_true(atomic_load(&val) > exp)
+#define atomic_assert_int_ge(val, exp) assert_true(atomic_load(&val) >= exp)
+#define atomic_assert_int_gt(val, exp) assert_true(atomic_load(&val) > exp)
+
+static int
+_setup(void **state __attribute__((unused))) {
+	char *p;
+
+	workers = isc_os_ncpus();
+	p = getenv("ISC_TASK_WORKERS");
+	if (p != NULL) {
+		workers = atoi(p);
+	}
+	INSIST(workers != 0);
+
+	if (isc_test_begin(NULL, false, workers) != ISC_R_SUCCESS) {
+		return (-1);
+	}
+
+	isc_hp_init(4 * workers);
+
+	signal(SIGPIPE, SIG_IGN);
+
+	if (getenv("CI_ENABLE_ALL_TESTS") != NULL) {
+		esends = NSENDS * workers;
+	} else {
+		esends = workers;
+		skip_long_tests = true;
+	}
+
+	return (0);
+}
+
+static int
+_teardown(void **state __attribute__((unused))) {
+	isc_test_end();
+
+	return (0);
+}
+
+static int
+setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) {
+	socklen_t addrlen = sizeof(*addr);
+	uv_os_sock_t fd;
+	int r;
+
+	isc_sockaddr_fromin6(addr, &in6addr_loopback, 0);
+
+	fd = socket(AF_INET6, family, 0);
+	if (fd < 0) {
+		perror("setup_ephemeral_port: socket()");
+		return (-1);
+	}
+
+	r = bind(fd, (const struct sockaddr *)&addr->type.sa,
+		 sizeof(addr->type.sin6));
+	if (r != 0) {
+		perror("setup_ephemeral_port: bind()");
+		isc__nm_closesocket(fd);
+		return (r);
+	}
+
+	r = getsockname(fd, (struct sockaddr *)&addr->type.sa, &addrlen);
+	if (r != 0) {
+		perror("setup_ephemeral_port: getsockname()");
+		isc__nm_closesocket(fd);
+		return (r);
+	}
+
+#if IPV6_RECVERR
+#define setsockopt_on(socket, level, name) \
+	setsockopt(socket, level, name, &(int){ 1 }, sizeof(int))
+
+	r = setsockopt_on(fd, IPPROTO_IPV6, IPV6_RECVERR);
+	if (r != 0) {
+		perror("setup_ephemeral_port");
+		isc__nm_closesocket(fd);
+		return (r);
+	}
+#endif
+
+	return (fd);
+}
+
+static int
+nm_setup(void **state __attribute__((unused))) {
+	uv_os_sock_t tcp_listen_sock = -1;
+	uv_os_sock_t udp_listen_sock = -1;
+
+	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
+	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
+
+	udp_listen_addr = (isc_sockaddr_t){ .length = 0 };
+	udp_listen_sock = setup_ephemeral_port(&udp_listen_addr, SOCK_DGRAM);
+	if (udp_listen_sock < 0) {
+		return (-1);
+	}
+	isc__nm_closesocket(udp_listen_sock);
+	udp_listen_sock = -1;
+
+	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
+	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
+
+	tcp_listen_addr = (isc_sockaddr_t){ .length = 0 };
+	tcp_listen_sock = setup_ephemeral_port(&tcp_listen_addr, SOCK_STREAM);
+	if (tcp_listen_sock < 0) {
+		return (-1);
+	}
+	isc__nm_closesocket(tcp_listen_sock);
+	tcp_listen_sock = -1;
+
+	if (isc_tlsctx_createserver(NULL, NULL, &tcp_listen_tlsctx) !=
+	    ISC_R_SUCCESS) {
+		return (-1);
+	}
+	if (isc_tlsctx_createclient(&tcp_connect_tlsctx) != ISC_R_SUCCESS) {
+		return (-1);
+	}
+
+	atomic_store(&do_send, true);
+	atomic_store(&nsends, esends);
+
+	atomic_store(&saccepts, 0);
+	atomic_store(&sreads, 0);
+	atomic_store(&ssends, 0);
+
+	atomic_store(&cconnects, 0);
+	atomic_store(&csends, 0);
+	atomic_store(&creads, 0);
+
+	isc_refcount_init(&active_cconnects, 0);
+	isc_refcount_init(&active_csends, 0);
+	isc_refcount_init(&active_creads, 0);
+	isc_refcount_init(&active_ssends, 0);
+	isc_refcount_init(&active_sreads, 0);
+
+	isc_nonce_buf(&send_magic, sizeof(send_magic));
+	isc_nonce_buf(&stop_magic, sizeof(stop_magic));
+	if (send_magic == stop_magic) {
+		return (-1);
+	}
+
+	listen_nm = isc_nm_start(test_mctx, workers);
+	assert_non_null(listen_nm);
+	isc_nm_settimeouts(listen_nm, T_INIT, T_IDLE, T_KEEPALIVE,
+			   T_ADVERTISED);
+
+	connect_nm = isc_nm_start(test_mctx, workers);
+	assert_non_null(connect_nm);
+	isc_nm_settimeouts(connect_nm, T_INIT, T_IDLE, T_KEEPALIVE,
+			   T_ADVERTISED);
+
+	isc_quota_init(&listener_quota, 0);
+	atomic_store(&check_listener_quota, false);
+
+	return (0);
+}
+
+static int
+nm_teardown(void **state __attribute__((unused))) {
+	UNUSED(state);
+
+	WAIT_FOR_EQ(active_cconnects, 0);
+	WAIT_FOR_EQ(active_csends, 0);
+	WAIT_FOR_EQ(active_csends, 0);
+	WAIT_FOR_EQ(active_ssends, 0);
+	WAIT_FOR_EQ(active_sreads, 0);
+
+	isc_nm_destroy(&connect_nm);
+	assert_null(connect_nm);
+
+	isc_nm_destroy(&listen_nm);
+	assert_null(listen_nm);
+
+	isc_refcount_destroy(&active_cconnects);
+	isc_refcount_destroy(&active_csends);
+	isc_refcount_destroy(&active_creads);
+	isc_refcount_destroy(&active_ssends);
+	isc_refcount_destroy(&active_sreads);
+
+	isc_tlsctx_free(&tcp_connect_tlsctx);
+	isc_tlsctx_free(&tcp_listen_tlsctx);
+
+	return (0);
+}
+
+/* Callbacks */
+
+static void
+noop_recv_cb(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
+	     void *cbarg) {
+	UNUSED(handle);
+	UNUSED(eresult);
+	UNUSED(region);
+	UNUSED(cbarg);
+}
+
+static unsigned int
+noop_accept_cb(isc_nmhandle_t *handle, unsigned int result, void *cbarg) {
+	UNUSED(handle);
+	UNUSED(result);
+	UNUSED(cbarg);
+
+	return (0);
+}
+
+static void
+noop_connect_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
+	UNUSED(handle);
+	UNUSED(result);
+	UNUSED(cbarg);
+
+	isc_refcount_decrement(&active_cconnects);
+}
+
+static void
+connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg);
+
+static void
+connect_send(isc_nmhandle_t *handle);
+
+static void
+connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
+	isc_nmhandle_t *sendhandle = handle;
+
+	assert_non_null(sendhandle);
+
+	UNUSED(cbarg);
+
+	F();
+
+	if (eresult != ISC_R_SUCCESS) {
+		/* Send failed, we need to stop reading too */
+		isc_nm_cancelread(handle);
+		goto unref;
+	}
+
+	atomic_fetch_add(&csends, 1);
+unref:
+	isc_refcount_decrement(&active_csends);
+	isc_nmhandle_detach(&sendhandle);
+}
+
+static void
+connect_send(isc_nmhandle_t *handle) {
+	isc_nmhandle_t *sendhandle = NULL;
+	isc_refcount_increment0(&active_csends);
+	isc_nmhandle_attach(handle, &sendhandle);
+	if (atomic_fetch_sub(&nsends, 1) > 1) {
+		isc_nm_send(sendhandle, (isc_region_t *)&send_msg,
+			    connect_send_cb, NULL);
+	} else {
+		isc_nm_send(sendhandle, (isc_region_t *)&stop_msg,
+			    connect_send_cb, NULL);
+	}
+}
+
+static void
+connect_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
+		isc_region_t *region, void *cbarg) {
+	uint64_t magic = 0;
+
+	UNUSED(cbarg);
+
+	assert_non_null(handle);
+
+	F();
+
+	if (eresult != ISC_R_SUCCESS) {
+		goto unref;
+	}
+
+	assert_int_equal(region->length, sizeof(magic));
+
+	atomic_fetch_add(&creads, 1);
+
+	memmove(&magic, region->base, sizeof(magic));
+
+	assert_true(magic == stop_magic || magic == send_magic);
+
+unref:
+	atomic_fetch_sub(&active_creads, 1);
+	isc_nmhandle_detach(&handle);
+}
+
+static void
+connect_connect_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
+	isc_nmhandle_t *readhandle = NULL;
+	UNUSED(cbarg);
+
+	F();
+
+	if (eresult != ISC_R_SUCCESS) {
+		goto unref;
+	}
+
+	atomic_fetch_add(&cconnects, 1);
+
+	isc_refcount_increment0(&active_creads);
+	isc_nmhandle_attach(handle, &readhandle);
+	isc_nm_read(handle, connect_read_cb, NULL);
+
+	connect_send(handle);
+
+unref:
+	isc_refcount_decrement(&active_cconnects);
+}
+
+static void
+listen_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
+	isc_nmhandle_t *sendhandle = handle;
+
+	UNUSED(cbarg);
+	UNUSED(eresult);
+
+	assert_non_null(sendhandle);
+
+	F();
+
+	if (eresult != ISC_R_SUCCESS) {
+		goto unref;
+	}
+
+	atomic_fetch_add(&ssends, 1);
+unref:
+	isc_nmhandle_detach(&sendhandle);
+	isc_refcount_decrement(&active_ssends);
+}
+
+static void
+listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
+	       isc_region_t *region, void *cbarg) {
+	uint64_t magic = 0;
+
+	assert_non_null(handle);
+
+	F();
+
+	if (eresult != ISC_R_SUCCESS) {
+		goto unref;
+	}
+
+	atomic_fetch_add(&sreads, 1);
+
+	assert_int_equal(region->length, sizeof(magic));
+
+	memmove(&magic, region->base, sizeof(magic));
+	assert_true(magic == stop_magic || magic == send_magic);
+
+	if (magic == send_magic) {
+		isc_nmhandle_t *sendhandle = NULL;
+		isc_nmhandle_attach(handle, &sendhandle);
+		isc_refcount_increment0(&active_ssends);
+		isc_nm_send(sendhandle, (isc_region_t *)&send_msg,
+			    listen_send_cb, cbarg);
+		return;
+	}
+	/* close the connection on stop_magic */
+unref:
+	if (handle == cbarg) {
+		isc_refcount_decrement(&active_sreads);
+		isc_nmhandle_detach(&handle);
+	}
+}
+
+static isc_result_t
+listen_accept_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
+	UNUSED(handle);
+	UNUSED(cbarg);
+
+	F();
+
+	return (eresult);
+}
+
+static isc_result_t
+stream_accept_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
+	isc_nmhandle_t *readhandle = NULL;
+
+	UNUSED(cbarg);
+
+	F();
+
+	if (eresult != ISC_R_SUCCESS) {
+		return (eresult);
+	}
+
+	atomic_fetch_add(&saccepts, 1);
+
+	isc_refcount_increment0(&active_sreads);
+	isc_nmhandle_attach(handle, &readhandle);
+	isc_nm_read(handle, listen_read_cb, readhandle);
+
+	return (ISC_R_SUCCESS);
+}
+
+typedef isc_result_t (*connect_func)(isc_nm_t *);
+
+static isc_threadresult_t
+connect_thread(isc_threadarg_t arg) {
+	connect_func connect = (connect_func)arg;
+	isc_result_t result;
+	isc_sockaddr_t connect_addr;
+
+	connect_addr = (isc_sockaddr_t){ .length = 0 };
+	isc_sockaddr_fromin6(&connect_addr, &in6addr_loopback, 0);
+
+	while (atomic_load(&do_send)) {
+		uint_fast32_t active =
+			isc_refcount_increment0(&active_cconnects);
+		if (active >= workers) {
+			/*
+			 * If we have more active connections than workers start
+			 * slowing down the connections to prevent the
+			 * thundering herd problem.
+			 */
+			usleep((active - workers) * 1000);
+		}
+		result = connect(connect_nm);
+		if (result != ISC_R_SUCCESS) {
+			/*
+			 * Also back-off and slow down if we start getting
+			 * errors to prevent the thundering herd problem.  This
+			 * could especially happen on FreeBSD where socket()
+			 * call can fail because of system limits and in such
+			 * case it's not such good idea to try again quickly.
+			 */
+			isc_refcount_decrement(&active_cconnects);
+			usleep(1000);
+		}
+	}
+
+	return ((isc_threadresult_t)0);
+}
+
+/* UDP */
+
+static isc_result_t
+udp_connect(isc_nm_t *nm) {
+	return (isc_nm_udpconnect(nm, (isc_nmiface_t *)&udp_connect_addr,
+				  (isc_nmiface_t *)&udp_listen_addr,
+				  connect_connect_cb, NULL, T_CONNECT, 0));
+}
+
+static void
+mock_listenudp_uv_udp_open(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	WILL_RETURN(uv_udp_open, UV_ENOMEM);
+
+	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
+				  noop_recv_cb, NULL, 0, &listen_sock);
+	assert_int_not_equal(result, ISC_R_SUCCESS);
+	assert_null(listen_sock);
+
+	RESET_RETURN;
+}
+
+static void
+mock_listenudp_uv_udp_bind(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	WILL_RETURN(uv_udp_bind, UV_EADDRINUSE);
+
+	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
+				  noop_recv_cb, NULL, 0, &listen_sock);
+	assert_int_not_equal(result, ISC_R_SUCCESS);
+	assert_null(listen_sock);
+
+	RESET_RETURN;
+}
+
+static void
+mock_listenudp_uv_udp_recv_start(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	WILL_RETURN(uv_udp_recv_start, UV_EADDRINUSE);
+
+	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
+				  noop_recv_cb, NULL, 0, &listen_sock);
+	assert_int_not_equal(result, ISC_R_SUCCESS);
+	assert_null(listen_sock);
+
+	RESET_RETURN;
+}
+
+static void
+mock_udpconnect_uv_udp_open(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+
+	WILL_RETURN(uv_udp_open, UV_ENOMEM);
+
+	isc_refcount_increment0(&active_cconnects);
+	result = isc_nm_udpconnect(connect_nm,
+				   (isc_nmiface_t *)&udp_connect_addr,
+				   (isc_nmiface_t *)&udp_listen_addr,
+				   noop_connect_cb, NULL, T_CONNECT, 0);
+	if (result != ISC_R_SUCCESS) {
+		isc_refcount_decrement(&active_cconnects);
+	}
+	assert_int_not_equal(result, ISC_R_SUCCESS);
+
+	isc_nm_closedown(connect_nm);
+
+	RESET_RETURN;
+}
+
+static void
+mock_udpconnect_uv_udp_bind(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+
+	WILL_RETURN(uv_udp_bind, UV_ENOMEM);
+
+	isc_refcount_increment0(&active_cconnects);
+	result = isc_nm_udpconnect(connect_nm,
+				   (isc_nmiface_t *)&udp_connect_addr,
+				   (isc_nmiface_t *)&udp_listen_addr,
+				   noop_connect_cb, NULL, T_CONNECT, 0);
+	if (result != ISC_R_SUCCESS) {
+		isc_refcount_decrement(&active_cconnects);
+	}
+	assert_int_not_equal(result, ISC_R_SUCCESS);
+
+	isc_nm_closedown(connect_nm);
+
+	RESET_RETURN;
+}
+
+#if HAVE_UV_UDP_CONNECT
+static void
+mock_udpconnect_uv_udp_connect(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+
+	WILL_RETURN(uv_udp_connect, UV_ENOMEM);
+
+	isc_refcount_increment0(&active_cconnects);
+	result = isc_nm_udpconnect(connect_nm,
+				   (isc_nmiface_t *)&udp_connect_addr,
+				   (isc_nmiface_t *)&udp_listen_addr,
+				   noop_connect_cb, NULL, T_CONNECT, 0);
+	if (result != ISC_R_SUCCESS) {
+		isc_refcount_decrement(&active_cconnects);
+	}
+	assert_int_not_equal(result, ISC_R_SUCCESS);
+
+	isc_nm_closedown(connect_nm);
+
+	RESET_RETURN;
+}
+#endif
+
+static void
+mock_udpconnect_uv_recv_buffer_size(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+
+	WILL_RETURN(uv_recv_buffer_size, UV_ENOMEM);
+
+	isc_refcount_increment0(&active_cconnects);
+	result = isc_nm_udpconnect(connect_nm,
+				   (isc_nmiface_t *)&udp_connect_addr,
+				   (isc_nmiface_t *)&udp_listen_addr,
+				   noop_connect_cb, NULL, T_CONNECT, 0);
+	if (result != ISC_R_SUCCESS) {
+		isc_refcount_decrement(&active_cconnects);
+	}
+	assert_int_equal(result, ISC_R_SUCCESS); /* FIXME: should fail */
+
+	isc_nm_closedown(connect_nm);
+
+	RESET_RETURN;
+}
+
+static void
+mock_udpconnect_uv_send_buffer_size(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+
+	WILL_RETURN(uv_send_buffer_size, UV_ENOMEM);
+
+	isc_refcount_increment0(&active_cconnects);
+	result = isc_nm_udpconnect(connect_nm,
+				   (isc_nmiface_t *)&udp_connect_addr,
+				   (isc_nmiface_t *)&udp_listen_addr,
+				   noop_connect_cb, NULL, T_CONNECT, 0);
+	if (result != ISC_R_SUCCESS) {
+		isc_refcount_decrement(&active_cconnects);
+	}
+	assert_int_equal(result, ISC_R_SUCCESS); /* FIXME: should fail */
+
+	isc_nm_closedown(connect_nm);
+
+	RESET_RETURN;
+}
+
+static void
+udp_noop(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
+				  noop_recv_cb, NULL, 0, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_udpconnect(connect_nm,
+					   (isc_nmiface_t *)&udp_connect_addr,
+					   (isc_nmiface_t *)&udp_listen_addr,
+					   noop_connect_cb, NULL, T_CONNECT, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	isc_nm_closedown(connect_nm);
+
+	atomic_assert_int_eq(cconnects, 0);
+	atomic_assert_int_eq(csends, 0);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 0);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+udp_noresponse(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
+				  noop_recv_cb, NULL, 0, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_udpconnect(
+			connect_nm, (isc_nmiface_t *)&udp_connect_addr,
+			(isc_nmiface_t *)&udp_listen_addr, connect_connect_cb,
+			NULL, T_CONNECT, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+	WAIT_FOR_EQ(csends, 1);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 1);
+	atomic_assert_int_eq(csends, 1);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 0);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+udp_recv_one(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	atomic_store(&nsends, 1);
+
+	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
+				  listen_read_cb, NULL, 0, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_udpconnect(
+			connect_nm, (isc_nmiface_t *)&udp_connect_addr,
+			(isc_nmiface_t *)&udp_listen_addr, connect_connect_cb,
+			NULL, T_CONNECT, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+	WAIT_FOR_LE(nsends, 0);
+	WAIT_FOR_EQ(csends, 1);
+	WAIT_FOR_EQ(sreads, 1);
+	WAIT_FOR_EQ(ssends, 0);
+	WAIT_FOR_EQ(creads, 0);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 1);
+	atomic_assert_int_eq(csends, 1);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 1);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+udp_recv_two(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	atomic_store(&nsends, 2);
+
+	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
+				  listen_read_cb, NULL, 0, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_udpconnect(
+			connect_nm, (isc_nmiface_t *)&udp_connect_addr,
+			(isc_nmiface_t *)&udp_listen_addr, connect_connect_cb,
+			NULL, T_CONNECT, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_udpconnect(
+			connect_nm, (isc_nmiface_t *)&udp_connect_addr,
+			(isc_nmiface_t *)&udp_listen_addr, connect_connect_cb,
+			NULL, T_CONNECT, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 2);
+	WAIT_FOR_LE(nsends, 0);
+	WAIT_FOR_EQ(csends, 2);
+	WAIT_FOR_EQ(sreads, 2);
+	WAIT_FOR_EQ(ssends, 1);
+	WAIT_FOR_EQ(creads, 1);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 2);
+	atomic_assert_int_eq(csends, 2);
+	atomic_assert_int_eq(creads, 1);
+	atomic_assert_int_eq(sreads, 2);
+	atomic_assert_int_eq(ssends, 1);
+}
+
+static void
+udp_recv_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
+				  listen_read_cb, NULL, 0, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, udp_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends);
+	WAIT_FOR_GE(csends, esends);
+	WAIT_FOR_GE(sreads, esends);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	isc_nm_closedown(connect_nm);
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_FULL(csends);
+	CHECK_RANGE_FULL(creads);
+	CHECK_RANGE_FULL(sreads);
+	CHECK_RANGE_FULL(ssends);
+}
+
+static void
+udp_recv_half_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
+				  listen_read_cb, NULL, 0, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, udp_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_closedown(connect_nm);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_FULL(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+static void
+udp_half_recv_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
+				  listen_read_cb, NULL, 0, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, udp_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	/* Try to send a little while longer */
+	usleep((esends / 2) * 10000);
+
+	isc_nm_closedown(connect_nm);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_FULL(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+static void
+udp_half_recv_half_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
+				  listen_read_cb, NULL, 0, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, udp_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_closedown(connect_nm);
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_FULL(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+/* TCP */
+
+static isc_quota_t *
+tcp_listener_init_quota(size_t nthreads);
+
+static isc_result_t
+tcp_connect(isc_nm_t *nm) {
+	return (isc_nm_tcpconnect(nm, (isc_nmiface_t *)&tcp_connect_addr,
+				  (isc_nmiface_t *)&tcp_listen_addr,
+				  connect_connect_cb, NULL, 1, 0));
+}
+
+static void
+tcp_noop(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
+				  noop_accept_cb, NULL, 0, 0, NULL,
+				  &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_tcpconnect(connect_nm,
+					   (isc_nmiface_t *)&tcp_connect_addr,
+					   (isc_nmiface_t *)&tcp_listen_addr,
+					   noop_connect_cb, NULL, 1, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	isc_nm_closedown(connect_nm);
+
+	atomic_assert_int_eq(cconnects, 0);
+	atomic_assert_int_eq(csends, 0);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 0);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+tcp_noresponse(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
+				  noop_accept_cb, NULL, 0, 0, NULL,
+				  &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_tcpconnect(connect_nm,
+					   (isc_nmiface_t *)&tcp_connect_addr,
+					   (isc_nmiface_t *)&tcp_listen_addr,
+					   connect_connect_cb, NULL, 1, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+	WAIT_FOR_EQ(csends, 1);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 1);
+	atomic_assert_int_eq(csends, 1);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 0);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+tcp_recv_one(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_quota_t *quotap = tcp_listener_init_quota(1);
+
+	atomic_store(&nsends, 1);
+
+	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
+				  stream_accept_cb, NULL, 0, 0, quotap,
+				  &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_tcpconnect(
+			connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
+			(isc_nmiface_t *)&tcp_listen_addr, connect_connect_cb,
+			NULL, T_CONNECT, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+	WAIT_FOR_LE(nsends, 0);
+	WAIT_FOR_EQ(csends, 1);
+	WAIT_FOR_EQ(sreads, 1);
+	WAIT_FOR_EQ(ssends, 0);
+	WAIT_FOR_EQ(creads, 0);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 1);
+	atomic_assert_int_eq(csends, 1);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 1);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+tcp_recv_two(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_quota_t *quotap = tcp_listener_init_quota(1);
+
+	atomic_store(&nsends, 2);
+
+	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
+				  stream_accept_cb, NULL, 0, 0, quotap,
+				  &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_tcpconnect(
+			connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
+			(isc_nmiface_t *)&tcp_listen_addr, connect_connect_cb,
+			NULL, T_CONNECT, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_tcpconnect(
+			connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
+			(isc_nmiface_t *)&tcp_listen_addr, connect_connect_cb,
+			NULL, T_CONNECT, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 2);
+	WAIT_FOR_LE(nsends, 0);
+	WAIT_FOR_EQ(csends, 2);
+	WAIT_FOR_EQ(sreads, 2);
+	WAIT_FOR_EQ(ssends, 1);
+	WAIT_FOR_EQ(creads, 1);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 2);
+	atomic_assert_int_eq(csends, 2);
+	atomic_assert_int_eq(creads, 1);
+	atomic_assert_int_eq(sreads, 2);
+	atomic_assert_int_eq(ssends, 1);
+}
+
+static void
+tcp_recv_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+	isc_quota_t *quotap = tcp_listener_init_quota(workers);
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
+				  stream_accept_cb, NULL, 0, 0, quotap,
+				  &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tcp_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends);
+	WAIT_FOR_GE(csends, esends);
+	WAIT_FOR_GE(sreads, esends);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	isc_nm_closedown(connect_nm);
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_FULL(csends);
+	CHECK_RANGE_FULL(creads);
+	CHECK_RANGE_FULL(sreads);
+	CHECK_RANGE_FULL(ssends);
+}
+
+static void
+tcp_recv_half_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+	isc_quota_t *quotap = tcp_listener_init_quota(workers);
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
+				  stream_accept_cb, NULL, 0, 0, quotap,
+				  &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tcp_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_closedown(connect_nm);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_HALF(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+static void
+tcp_half_recv_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+	isc_quota_t *quotap = tcp_listener_init_quota(workers);
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
+				  stream_accept_cb, NULL, 0, 0, quotap,
+				  &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tcp_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	/* Try to send a little while longer */
+	usleep((esends / 2) * 10000);
+
+	isc_nm_closedown(connect_nm);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_HALF(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+static void
+tcp_half_recv_half_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+	isc_quota_t *quotap = tcp_listener_init_quota(workers);
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
+				  stream_accept_cb, NULL, 0, 0, quotap,
+				  &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tcp_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_closedown(connect_nm);
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_HALF(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+/* TCP Quota */
+
+static isc_quota_t *
+tcp_listener_init_quota(size_t nthreads) {
+	isc_quota_t *quotap = NULL;
+	if (atomic_load(&check_listener_quota)) {
+		unsigned max_quota = ISC_MAX(nthreads / 2, 1);
+		isc_quota_max(&listener_quota, max_quota);
+		quotap = &listener_quota;
+	}
+	return quotap;
+}
+
+static void
+tcp_recv_one_quota(void **state) {
+	atomic_store(&check_listener_quota, true);
+	tcp_recv_one(state);
+}
+
+static void
+tcp_recv_two_quota(void **state) {
+	atomic_store(&check_listener_quota, true);
+	tcp_recv_two(state);
+}
+
+static void
+tcp_recv_send_quota(void **state) {
+	SKIP_IN_CI;
+	atomic_store(&check_listener_quota, true);
+	tcp_recv_send(state);
+}
+
+static void
+tcp_recv_half_send_quota(void **state) {
+	SKIP_IN_CI;
+	atomic_store(&check_listener_quota, true);
+	tcp_recv_half_send(state);
+}
+
+static void
+tcp_half_recv_send_quota(void **state) {
+	SKIP_IN_CI;
+	atomic_store(&check_listener_quota, true);
+	tcp_half_recv_send(state);
+}
+
+static void
+tcp_half_recv_half_send_quota(void **state) {
+	SKIP_IN_CI;
+	atomic_store(&check_listener_quota, true);
+	tcp_half_recv_half_send(state);
+}
+
+/* TCPDNS */
+
+static isc_result_t
+tcpdns_connect(isc_nm_t *nm) {
+	return (isc_nm_tcpdnsconnect(nm, (isc_nmiface_t *)&tcp_connect_addr,
+				     (isc_nmiface_t *)&tcp_listen_addr,
+				     connect_connect_cb, NULL, T_CONNECT, 0));
+}
+
+static void
+tcpdns_noop(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	result = isc_nm_listentcpdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, noop_recv_cb,
+		NULL, noop_accept_cb, NULL, 0, 0, NULL, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	isc_refcount_increment0(&active_cconnects);
+	result = isc_nm_tcpdnsconnect(connect_nm,
+				      (isc_nmiface_t *)&tcp_connect_addr,
+				      (isc_nmiface_t *)&tcp_listen_addr,
+				      noop_connect_cb, NULL, T_CONNECT, 0);
+	if (result != ISC_R_SUCCESS) {
+		isc_refcount_decrement(&active_cconnects);
+		usleep(1000);
+	}
+	assert_int_equal(result, ISC_R_SUCCESS);
+	isc_nm_closedown(connect_nm);
+
+	atomic_assert_int_eq(cconnects, 0);
+	atomic_assert_int_eq(csends, 0);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 0);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+tcpdns_noresponse(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	isc_refcount_increment0(&active_cconnects);
+	result = isc_nm_listentcpdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, noop_recv_cb,
+		NULL, noop_accept_cb, NULL, 0, 0, NULL, &listen_sock);
+	if (result != ISC_R_SUCCESS) {
+		isc_refcount_decrement(&active_cconnects);
+		usleep(1000);
+	}
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	result = isc_nm_tcpdnsconnect(connect_nm,
+				      (isc_nmiface_t *)&tcp_connect_addr,
+				      (isc_nmiface_t *)&tcp_listen_addr,
+				      connect_connect_cb, NULL, T_CONNECT, 0);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+	WAIT_FOR_EQ(csends, 1);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 1);
+	atomic_assert_int_eq(csends, 1);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 0);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+tcpdns_recv_one(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	atomic_store(&nsends, 1);
+
+	result = isc_nm_listentcpdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	isc_refcount_increment0(&active_cconnects);
+	result = isc_nm_tcpdnsconnect(connect_nm,
+				      (isc_nmiface_t *)&tcp_connect_addr,
+				      (isc_nmiface_t *)&tcp_listen_addr,
+				      connect_connect_cb, NULL, T_CONNECT, 0);
+	if (result != ISC_R_SUCCESS) {
+		isc_refcount_decrement(&active_cconnects);
+	}
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+	WAIT_FOR_LE(nsends, 0);
+	WAIT_FOR_EQ(csends, 1);
+	WAIT_FOR_EQ(sreads, 1);
+	WAIT_FOR_EQ(ssends, 0);
+	WAIT_FOR_EQ(creads, 0);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 1);
+	atomic_assert_int_eq(csends, 1);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 1);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+tcpdns_recv_two(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	atomic_store(&nsends, 2);
+
+	result = isc_nm_listentcpdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_tcpdnsconnect(
+			connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
+			(isc_nmiface_t *)&tcp_listen_addr, connect_connect_cb,
+			NULL, T_CONNECT, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_tcpdnsconnect(
+			connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
+			(isc_nmiface_t *)&tcp_listen_addr, connect_connect_cb,
+			NULL, T_CONNECT, 0);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+		}
+	} while (result != ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 2);
+
+	WAIT_FOR_LE(nsends, 0);
+	WAIT_FOR_EQ(csends, 2);
+	WAIT_FOR_EQ(sreads, 2);
+	WAIT_FOR_EQ(ssends, 1);
+	WAIT_FOR_EQ(creads, 1);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 2);
+	atomic_assert_int_eq(csends, 2);
+	atomic_assert_int_eq(creads, 1);
+	atomic_assert_int_eq(sreads, 2);
+	atomic_assert_int_eq(ssends, 1);
+}
+
+static void
+tcpdns_recv_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentcpdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tcpdns_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends);
+	WAIT_FOR_GE(csends, esends);
+	WAIT_FOR_GE(sreads, esends);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	isc_nm_closedown(connect_nm);
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_FULL(csends);
+	CHECK_RANGE_FULL(creads);
+	CHECK_RANGE_FULL(sreads);
+	CHECK_RANGE_FULL(ssends);
+}
+
+static void
+tcpdns_recv_half_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentcpdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tcpdns_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_closedown(connect_nm);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_HALF(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+static void
+tcpdns_half_recv_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentcpdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tcpdns_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	/* Try to send a little while longer */
+	usleep((esends / 2) * 10000);
+
+	isc_nm_closedown(connect_nm);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_HALF(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+static void
+tcpdns_half_recv_half_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentcpdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, &listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tcpdns_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_closedown(connect_nm);
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_HALF(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+/* TLSDNS */
+
+static isc_result_t
+tlsdns_connect(isc_nm_t *nm) {
+	return (isc_nm_tlsdnsconnect(nm, (isc_nmiface_t *)&tcp_connect_addr,
+				     (isc_nmiface_t *)&tcp_listen_addr,
+				     connect_connect_cb, NULL, T_CONNECT, 0,
+				     tcp_connect_tlsctx));
+}
+
+static void
+tlsdns_noop(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	result = isc_nm_listentlsdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, noop_recv_cb,
+		NULL, noop_accept_cb, NULL, 0, 0, NULL, tcp_listen_tlsctx,
+		&listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_tlsdnsconnect(
+			connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
+			(isc_nmiface_t *)&tcp_listen_addr, noop_connect_cb,
+			NULL, T_CONNECT, 0, tcp_connect_tlsctx);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+			usleep(1000);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	isc_nm_closedown(connect_nm);
+
+	atomic_assert_int_eq(cconnects, 0);
+	atomic_assert_int_eq(csends, 0);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 0);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+tlsdns_noresponse(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_sockaddr_t connect_addr;
+
+	connect_addr = (isc_sockaddr_t){ .length = 0 };
+	isc_sockaddr_fromin6(&connect_addr, &in6addr_loopback, 0);
+
+	result = isc_nm_listentlsdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, noop_recv_cb,
+		NULL, noop_accept_cb, NULL, 0, 0, NULL, tcp_listen_tlsctx,
+		&listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	do {
+		isc_refcount_increment0(&active_cconnects);
+		result = isc_nm_tlsdnsconnect(
+			connect_nm, (isc_nmiface_t *)&connect_addr,
+			(isc_nmiface_t *)&tcp_listen_addr, connect_connect_cb,
+			NULL, T_CONNECT, 0, tcp_connect_tlsctx);
+		if (result != ISC_R_SUCCESS) {
+			isc_refcount_decrement(&active_cconnects);
+			usleep(1000);
+		}
+	} while (result != ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+	WAIT_FOR_EQ(csends, 1);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 1);
+	atomic_assert_int_eq(csends, 1);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 0);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+tlsdns_recv_one(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	atomic_store(&nsends, 1);
+
+	result = isc_nm_listentlsdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, tcp_listen_tlsctx,
+		&listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	isc_refcount_increment0(&active_cconnects);
+	result = isc_nm_tlsdnsconnect(
+		connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
+		(isc_nmiface_t *)&tcp_listen_addr, connect_connect_cb, NULL,
+		T_CONNECT, 0, tcp_connect_tlsctx);
+	if (result != ISC_R_SUCCESS) {
+		isc_refcount_decrement(&active_cconnects);
+		usleep(1000);
+	}
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+	WAIT_FOR_LE(nsends, 0);
+	WAIT_FOR_EQ(csends, 1);
+	WAIT_FOR_EQ(sreads, 1);
+	WAIT_FOR_EQ(ssends, 0);
+	WAIT_FOR_EQ(creads, 0);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 1);
+	atomic_assert_int_eq(csends, 1);
+	atomic_assert_int_eq(creads, 0);
+	atomic_assert_int_eq(sreads, 1);
+	atomic_assert_int_eq(ssends, 0);
+}
+
+static void
+tlsdns_recv_two(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+
+	atomic_store(&nsends, 2);
+
+	result = isc_nm_listentlsdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, tcp_listen_tlsctx,
+		&listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	isc_refcount_increment0(&active_cconnects);
+	result = isc_nm_tlsdnsconnect(
+		connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
+		(isc_nmiface_t *)&tcp_listen_addr, connect_connect_cb, NULL,
+		T_CONNECT, 0, tcp_connect_tlsctx);
+	if (result != ISC_R_SUCCESS) {
+		isc_refcount_decrement(&active_cconnects);
+		usleep(1000);
+	}
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 1);
+
+	isc_refcount_increment0(&active_cconnects);
+	result = isc_nm_tlsdnsconnect(
+		connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
+		(isc_nmiface_t *)&tcp_listen_addr, connect_connect_cb, NULL,
+		T_CONNECT, 0, tcp_connect_tlsctx);
+	if (result != ISC_R_SUCCESS) {
+		isc_refcount_decrement(&active_cconnects);
+		usleep(1000);
+	}
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	WAIT_FOR_EQ(cconnects, 2);
+
+	WAIT_FOR_LE(nsends, 0);
+	WAIT_FOR_EQ(csends, 2);
+	WAIT_FOR_EQ(sreads, 2);
+	WAIT_FOR_EQ(ssends, 1);
+	WAIT_FOR_EQ(creads, 1);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+	isc_nm_closedown(connect_nm);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	atomic_assert_int_eq(cconnects, 2);
+	atomic_assert_int_eq(csends, 2);
+	atomic_assert_int_eq(creads, 1);
+	atomic_assert_int_eq(sreads, 2);
+	atomic_assert_int_eq(ssends, 1);
+}
+
+static void
+tlsdns_recv_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentlsdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, tcp_listen_tlsctx,
+		&listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tlsdns_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends);
+	WAIT_FOR_GE(csends, esends);
+	WAIT_FOR_GE(sreads, esends);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	isc_nm_closedown(connect_nm);
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_FULL(csends);
+	CHECK_RANGE_FULL(creads);
+	CHECK_RANGE_FULL(sreads);
+	CHECK_RANGE_FULL(ssends);
+}
+
+static void
+tlsdns_recv_half_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentlsdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, tcp_listen_tlsctx,
+		&listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tlsdns_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_closedown(connect_nm);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_HALF(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+static void
+tlsdns_half_recv_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentlsdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, tcp_listen_tlsctx,
+		&listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tlsdns_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	/* Try to send a little while longer */
+	usleep((esends / 2) * 10000);
+
+	isc_nm_closedown(connect_nm);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_HALF(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+static void
+tlsdns_half_recv_half_send(void **state __attribute__((unused))) {
+	isc_result_t result = ISC_R_SUCCESS;
+	isc_nmsocket_t *listen_sock = NULL;
+	isc_thread_t threads[workers];
+
+	SKIP_IN_CI;
+
+	result = isc_nm_listentlsdns(
+		listen_nm, (isc_nmiface_t *)&tcp_listen_addr, listen_read_cb,
+		NULL, listen_accept_cb, NULL, 0, 0, NULL, tcp_listen_tlsctx,
+		&listen_sock);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	memset(threads, 0, sizeof(threads));
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_create(connect_thread, tlsdns_connect, &threads[i]);
+	}
+
+	WAIT_FOR_GE(cconnects, esends / 2);
+	WAIT_FOR_GE(csends, esends / 2);
+	WAIT_FOR_GE(sreads, esends / 2);
+	WAIT_FOR_GE(ssends, esends / 2);
+	WAIT_FOR_GE(creads, esends / 2);
+
+	isc_nm_closedown(connect_nm);
+	isc_nm_stoplistening(listen_sock);
+	isc_nmsocket_close(&listen_sock);
+	assert_null(listen_sock);
+
+	DONE();
+	for (size_t i = 0; i < workers; i++) {
+		isc_thread_join(threads[i], NULL);
+	}
+
+	X(cconnects);
+	X(csends);
+	X(creads);
+	X(sreads);
+	X(ssends);
+
+	CHECK_RANGE_HALF(csends);
+	CHECK_RANGE_HALF(creads);
+	CHECK_RANGE_HALF(sreads);
+	CHECK_RANGE_HALF(ssends);
+}
+
+int
+main(void) {
+	const struct CMUnitTest tests[] = {
+		/* UDP */
+		cmocka_unit_test_setup_teardown(mock_listenudp_uv_udp_open,
+						nm_setup, nm_teardown),
+		cmocka_unit_test_setup_teardown(mock_listenudp_uv_udp_bind,
+						nm_setup, nm_teardown),
+		cmocka_unit_test_setup_teardown(
+			mock_listenudp_uv_udp_recv_start, nm_setup,
+			nm_teardown),
+		cmocka_unit_test_setup_teardown(mock_udpconnect_uv_udp_open,
+						nm_setup, nm_teardown),
+		cmocka_unit_test_setup_teardown(mock_udpconnect_uv_udp_bind,
+						nm_setup, nm_teardown),
+#if HAVE_UV_UDP_CONNECT
+		cmocka_unit_test_setup_teardown(mock_udpconnect_uv_udp_connect,
+						nm_setup, nm_teardown),
+#endif
+		cmocka_unit_test_setup_teardown(
+			mock_udpconnect_uv_recv_buffer_size, nm_setup,
+			nm_teardown),
+		cmocka_unit_test_setup_teardown(
+			mock_udpconnect_uv_send_buffer_size, nm_setup,
+			nm_teardown),
+		cmocka_unit_test_setup_teardown(udp_noop, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(udp_noresponse, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(udp_recv_one, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(udp_recv_two, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(udp_recv_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(udp_recv_half_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(udp_half_recv_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(udp_half_recv_half_send,
+						nm_setup, nm_teardown),
+
+		/* TCP */
+		/* cmocka_unit_test_setup_teardown(mock_listentcp_uv_tcp_bind,
+		 */
+		/* 				nm_setup, nm_teardown), */
+		/* cmocka_unit_test_setup_teardown(mock_listentcp_uv_fileno, */
+		/* 				nm_setup, nm_teardown), */
+		/* cmocka_unit_test_setup_teardown( */
+		/* 	mock_listentcp_uv_tcp_getsockname, nm_setup, */
+		/* 	nm_teardown), */
+		/* cmocka_unit_test_setup_teardown(mock_listentcp_uv_listen, */
+		/* 				nm_setup, nm_teardown), */
+		/* cmocka_unit_test_setup_teardown(mock_tcpconnect_uv_tcp_bind,
+		 */
+		/* 				nm_setup, nm_teardown), */
+		/* cmocka_unit_test_setup_teardown(mock_tcpconnect_uv_tcp_connect,
+		 */
+		/* 				nm_setup, nm_teardown), */
+		cmocka_unit_test_setup_teardown(tcp_noop, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_noresponse, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_recv_one, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_recv_two, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_recv_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_recv_half_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_half_recv_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_half_recv_half_send,
+						nm_setup, nm_teardown),
+
+		/* TCP Quota */
+		cmocka_unit_test_setup_teardown(tcp_recv_one_quota, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_recv_two_quota, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_recv_send_quota, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_recv_half_send_quota,
+						nm_setup, nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_half_recv_send_quota,
+						nm_setup, nm_teardown),
+		cmocka_unit_test_setup_teardown(tcp_half_recv_half_send_quota,
+						nm_setup, nm_teardown),
+
+		/* TCPDNS */
+		cmocka_unit_test_setup_teardown(tcpdns_recv_one, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcpdns_recv_two, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcpdns_noop, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcpdns_noresponse, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcpdns_recv_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcpdns_recv_half_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcpdns_half_recv_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tcpdns_half_recv_half_send,
+						nm_setup, nm_teardown),
+
+		/* TLSDNS */
+		cmocka_unit_test_setup_teardown(tlsdns_recv_one, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tlsdns_recv_two, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tlsdns_noop, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tlsdns_noresponse, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tlsdns_recv_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tlsdns_recv_half_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tlsdns_half_recv_send, nm_setup,
+						nm_teardown),
+		cmocka_unit_test_setup_teardown(tlsdns_half_recv_half_send,
+						nm_setup, nm_teardown),
+	};
+
+	return (cmocka_run_group_tests(tests, _setup, _teardown));
+}
+
+#else /* HAVE_CMOCKA */
+
+#include <stdio.h>
+
+int
+main(void) {
+	printf("1..0 # Skipped: cmocka not available\n");
+	return (SKIPPED_TEST_EXIT_CODE);
+}
+
+#endif /* if HAVE_CMOCKA */
diff --git a/lib/isc/tests/tcp_quota_test.c b/lib/isc/tests/tcp_quota_test.c
deleted file mode 100644
index 737c3c1d1f..0000000000
--- a/lib/isc/tests/tcp_quota_test.c
+++ /dev/null
@@ -1,737 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#if HAVE_CMOCKA
-#include <sched.h> /* IWYU pragma: keep */
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-#include <uv.h>
-
-#define UNIT_TESTING
-#include <cmocka.h>
-
-#include <isc/atomic.h>
-#include <isc/buffer.h>
-#include <isc/condition.h>
-#include <isc/mutex.h>
-#include <isc/netmgr.h>
-#include <isc/nonce.h>
-#include <isc/os.h>
-#include <isc/refcount.h>
-#include <isc/sockaddr.h>
-#include <isc/thread.h>
-
-#include "../netmgr/netmgr-int.h"
-#include "isctest.h"
-
-#define MAX_NM 2
-
-static isc_sockaddr_t tcp_listen_addr;
-
-static uint64_t send_magic = 0;
-static uint64_t stop_magic = 0;
-
-static uv_buf_t send_msg = { .base = (char *)&send_magic,
-			     .len = sizeof(send_magic) };
-static uv_buf_t stop_msg = { .base = (char *)&stop_magic,
-			     .len = sizeof(stop_magic) };
-
-static atomic_uint_fast64_t nsends;
-
-static atomic_uint_fast64_t ssends;
-static atomic_uint_fast64_t sreads;
-
-static atomic_uint_fast64_t saccepts;
-
-static atomic_uint_fast64_t cconnects;
-static atomic_uint_fast64_t csends;
-static atomic_uint_fast64_t creads;
-static atomic_uint_fast64_t ctimeouts;
-
-static unsigned int workers = 2;
-
-static isc_quota_t listener_quota;
-static atomic_bool check_listener_quota;
-
-#define NSENDS	100
-#define NWRITES 10
-
-/* Enable this to print values while running tests */
-#undef PRINT_DEBUG
-#ifdef PRINT_DEBUG
-#define X(v) fprintf(stderr, #v " = %" PRIu64 "\n", atomic_load(&v))
-#define P(v) fprintf(stderr, #v " = %" PRIu64 "\n", v)
-#else
-#define X(v)
-#define P(v)
-#endif
-
-static int
-setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) {
-	isc_result_t result;
-	socklen_t addrlen = sizeof(*addr);
-	int fd;
-	int r;
-
-	isc_sockaddr_fromin6(addr, &in6addr_loopback, 0);
-
-	fd = socket(AF_INET6, family, 0);
-	if (fd < 0) {
-		perror("setup_ephemeral_port: socket()");
-		return (-1);
-	}
-
-	r = bind(fd, (const struct sockaddr *)&addr->type.sa,
-		 sizeof(addr->type.sin6));
-	if (r != 0) {
-		perror("setup_ephemeral_port: bind()");
-		close(fd);
-		return (r);
-	}
-
-	r = getsockname(fd, (struct sockaddr *)&addr->type.sa, &addrlen);
-	if (r != 0) {
-		perror("setup_ephemeral_port: getsockname()");
-		close(fd);
-		return (r);
-	}
-
-	result = isc__nm_socket_reuse(fd);
-	if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) {
-		fprintf(stderr,
-			"setup_ephemeral_port: isc__nm_socket_reuse(): %s",
-			isc_result_totext(result));
-		close(fd);
-		return (-1);
-	}
-
-	result = isc__nm_socket_reuse_lb(fd);
-	if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) {
-		fprintf(stderr,
-			"setup_ephemeral_port: isc__nm_socket_reuse_lb(): %s",
-			isc_result_totext(result));
-		close(fd);
-		return (-1);
-	}
-
-#if IPV6_RECVERR
-#define setsockopt_on(socket, level, name) \
-	setsockopt(socket, level, name, &(int){ 1 }, sizeof(int))
-
-	r = setsockopt_on(fd, IPPROTO_IPV6, IPV6_RECVERR);
-	if (r != 0) {
-		perror("setup_ephemeral_port");
-		close(fd);
-		return (r);
-	}
-#endif
-
-	return (fd);
-}
-
-static int
-_setup(void **state) {
-	UNUSED(state);
-
-	/* workers = isc_os_ncpus(); */
-
-	if (isc_test_begin(NULL, true, workers) != ISC_R_SUCCESS) {
-		return (-1);
-	}
-
-	signal(SIGPIPE, SIG_IGN);
-
-	return (0);
-}
-
-static int
-_teardown(void **state) {
-	UNUSED(state);
-
-	isc_test_end();
-
-	return (0);
-}
-
-/* Generic */
-
-thread_local uint8_t tcp_buffer_storage[4096];
-thread_local size_t tcp_buffer_length = 0;
-
-static int
-nm_setup(void **state) {
-	size_t nworkers = ISC_MAX(ISC_MIN(workers, 32), 1);
-	int tcp_listen_sock = -1;
-	isc_nm_t **nm = NULL;
-
-	tcp_listen_addr = (isc_sockaddr_t){ .length = 0 };
-	tcp_listen_sock = setup_ephemeral_port(&tcp_listen_addr, SOCK_STREAM);
-	if (tcp_listen_sock < 0) {
-		return (-1);
-	}
-	close(tcp_listen_sock);
-	tcp_listen_sock = -1;
-
-	atomic_store(&nsends, NSENDS * NWRITES);
-
-	atomic_store(&csends, 0);
-	atomic_store(&creads, 0);
-	atomic_store(&sreads, 0);
-	atomic_store(&ssends, 0);
-	atomic_store(&saccepts, 0);
-	atomic_store(&ctimeouts, 0);
-	atomic_store(&cconnects, 0);
-
-	isc_nonce_buf(&send_magic, sizeof(send_magic));
-	isc_nonce_buf(&stop_magic, sizeof(stop_magic));
-	if (send_magic == stop_magic) {
-		return (-1);
-	}
-
-	nm = isc_mem_get(test_mctx, MAX_NM * sizeof(nm[0]));
-	for (size_t i = 0; i < MAX_NM; i++) {
-		nm[i] = isc_nm_start(test_mctx, nworkers);
-		assert_non_null(nm[i]);
-	}
-
-	*state = nm;
-
-	isc_quota_init(&listener_quota, 0);
-	atomic_store(&check_listener_quota, false);
-	return (0);
-}
-
-static int
-nm_teardown(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-
-	for (size_t i = 0; i < MAX_NM; i++) {
-		isc_nm_destroy(&nm[i]);
-		assert_null(nm[i]);
-	}
-	isc_mem_put(test_mctx, nm, MAX_NM * sizeof(nm[0]));
-
-	isc_quota_destroy(&listener_quota);
-	return (0);
-}
-
-thread_local size_t nwrites = NWRITES;
-
-/* TCP Connect */
-
-static void
-tcp_connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg);
-
-static void
-tcp_connect_send(isc_nmhandle_t *handle);
-
-static void
-tcp_connect_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		    isc_region_t *region, void *cbarg) {
-	uint64_t magic = 0;
-
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-	if (eresult != ISC_R_SUCCESS) {
-		goto unref;
-	}
-
-	memmove(tcp_buffer_storage + tcp_buffer_length, region->base,
-		region->length);
-	tcp_buffer_length += region->length;
-
-	if (tcp_buffer_length >= sizeof(magic)) {
-		isc_nm_pauseread(handle);
-
-		atomic_fetch_add(&creads, 1);
-
-		memmove(&magic, tcp_buffer_storage, sizeof(magic));
-		assert_true(magic == stop_magic || magic == send_magic);
-
-		tcp_buffer_length -= sizeof(magic);
-		memmove(tcp_buffer_storage, tcp_buffer_storage + sizeof(magic),
-			tcp_buffer_length);
-
-		if (magic == send_magic) {
-			tcp_connect_send(handle);
-			return;
-		} else if (magic == stop_magic) {
-			/* We are done, so we don't send anything back */
-			/* There should be no more packets in the buffer */
-			assert_int_equal(tcp_buffer_length, 0);
-		}
-	}
-unref:
-	isc_nmhandle_detach(&handle);
-}
-
-static void
-tcp_connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
-	assert_non_null(handle);
-	UNUSED(cbarg);
-
-	if (eresult == ISC_R_SUCCESS) {
-		atomic_fetch_add(&csends, 1);
-		isc_nm_resumeread(handle);
-	} else {
-		/* Send failed, we need to stop reading too */
-		isc_nm_cancelread(handle);
-	}
-}
-
-static void
-tcp_connect_shutdown(isc_nmhandle_t *handle, isc_result_t eresult,
-		     void *cbarg) {
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-
-	if (eresult == ISC_R_SUCCESS) {
-		atomic_fetch_add(&csends, 1);
-	} else {
-		isc_nm_cancelread(handle);
-	}
-}
-
-static void
-tcp_connect_send(isc_nmhandle_t *handle) {
-	uint_fast64_t sends = atomic_load(&nsends);
-
-	while (sends > 0) {
-		/* Continue until we subtract or we are done */
-		if (atomic_compare_exchange_weak(&nsends, &sends, sends - 1)) {
-			sends--;
-			break;
-		}
-	}
-
-	if (sends == 0) {
-		isc_nm_send(handle, (isc_region_t *)&stop_msg,
-			    tcp_connect_shutdown, NULL);
-	} else {
-		isc_nm_send(handle, (isc_region_t *)&send_msg,
-			    tcp_connect_send_cb, NULL);
-	}
-}
-
-static void
-tcp_connect_connect_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		       void *cbarg) {
-	isc_nmhandle_t *readhandle = NULL;
-
-	UNUSED(cbarg);
-
-	if (eresult != ISC_R_SUCCESS) {
-		uint_fast64_t sends = atomic_load(&nsends);
-
-		/* We failed to connect; try again */
-		while (sends > 0) {
-			/* Continue until we subtract or we are done */
-			if (atomic_compare_exchange_weak(&nsends, &sends,
-							 sends - 1)) {
-				sends--;
-				break;
-			}
-		}
-		return;
-	}
-
-	atomic_fetch_add(&cconnects, 1);
-
-	isc_nmhandle_attach(handle, &readhandle);
-	isc_nm_read(handle, tcp_connect_read_cb, NULL);
-
-	tcp_connect_send(handle);
-}
-
-static isc_result_t
-tcp_listen_accept_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg);
-
-static isc_threadresult_t
-tcp_connect_thread(isc_threadarg_t arg) {
-	isc_nm_t *connect_nm = (isc_nm_t *)arg;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	while (atomic_load(&nsends) > 0) {
-		(void)isc_nm_tcpconnect(connect_nm,
-					(isc_nmiface_t *)&tcp_connect_addr,
-					(isc_nmiface_t *)&tcp_listen_addr,
-					tcp_connect_connect_cb, NULL, 1000, 0);
-	}
-
-	return ((isc_threadresult_t)0);
-}
-
-static isc_quota_t *
-tcp_listener_init_quota(size_t nthreads) {
-	isc_quota_t *quotap = NULL;
-	if (atomic_load(&check_listener_quota)) {
-		unsigned max_quota = ISC_MAX(nthreads / 2, 1);
-		isc_quota_max(&listener_quota, max_quota);
-		quotap = &listener_quota;
-	}
-	return quotap;
-}
-
-static void
-tcp_recv_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_thread_t threads[32] = { 0 };
-	isc_quota_t *quotap = tcp_listener_init_quota(nthreads);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  tcp_listen_accept_cb, NULL, 0, 0, quotap,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_closedown(connect_nm);
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-	X(saccepts);
-
-	/* assert_true(atomic_load(&csends) >= atomic_load(&sreads)); */
-	assert_true(atomic_load(&sreads) >= atomic_load(&ssends));
-	/* assert_true(atomic_load(&ssends) >= atomic_load(&creads)); */
-	assert_true(atomic_load(&creads) <= atomic_load(&csends));
-	assert_true(atomic_load(&creads) >= atomic_load(&ctimeouts));
-}
-
-static void
-tcp_recv_half_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_thread_t threads[32] = { 0 };
-	isc_quota_t *quotap = tcp_listener_init_quota(nthreads);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  tcp_listen_accept_cb, NULL, 0, 0, quotap,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_closedown(connect_nm);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-	X(saccepts);
-
-	/* assert_true(atomic_load(&csends) >= atomic_load(&sreads)); */
-	assert_true(atomic_load(&sreads) >= atomic_load(&ssends));
-	/* assert_true(atomic_load(&ssends) >= atomic_load(&creads)); */
-	assert_true(atomic_load(&creads) <= atomic_load(&csends));
-	assert_true(atomic_load(&creads) >= atomic_load(&ctimeouts));
-}
-
-static void
-tcp_half_recv_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_thread_t threads[32] = { 0 };
-	isc_quota_t *quotap = tcp_listener_init_quota(nthreads);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  tcp_listen_accept_cb, NULL, 0, 0, quotap,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-	X(saccepts);
-
-	/* assert_true(atomic_load(&csends) >= atomic_load(&sreads)); */
-	assert_true(atomic_load(&sreads) >= atomic_load(&ssends));
-	/* assert_true(atomic_load(&ssends) >= atomic_load(&creads)); */
-	assert_true(atomic_load(&creads) <= atomic_load(&csends));
-	assert_true(atomic_load(&creads) >= atomic_load(&ctimeouts));
-}
-
-static void
-tcp_half_recv_half_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_thread_t threads[32] = { 0 };
-	isc_quota_t *quotap = tcp_listener_init_quota(nthreads);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  tcp_listen_accept_cb, NULL, 0, 0, quotap,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_closedown(connect_nm);
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-	X(saccepts);
-
-	/* assert_true(atomic_load(&csends) >= atomic_load(&sreads)); */
-	assert_true(atomic_load(&sreads) >= atomic_load(&ssends));
-	/* assert_true(atomic_load(&ssends) >= atomic_load(&creads)); */
-	assert_true(atomic_load(&creads) <= atomic_load(&csends));
-	assert_true(atomic_load(&creads) >= atomic_load(&ctimeouts));
-}
-
-static void
-tcp_recv_send_quota(void **state) {
-	atomic_store(&check_listener_quota, true);
-	tcp_recv_send(state);
-}
-
-static void
-tcp_recv_half_send_quota(void **state) {
-	atomic_store(&check_listener_quota, true);
-	tcp_recv_half_send(state);
-}
-
-static void
-tcp_half_recv_send_quota(void **state) {
-	atomic_store(&check_listener_quota, true);
-	tcp_half_recv_send(state);
-}
-
-static void
-tcp_half_recv_half_send_quota(void **state) {
-	atomic_store(&check_listener_quota, true);
-	tcp_half_recv_half_send(state);
-}
-
-/* TCP Listener */
-
-/*
- * TODO:
- * 1. write a timeout test
- */
-
-static void
-tcp_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		   isc_region_t *region, void *cbarg);
-
-static void
-tcp_listen_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
-	UNUSED(eresult);
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-
-	if (eresult == ISC_R_SUCCESS) {
-		atomic_fetch_add(&ssends, 1);
-		isc_nm_resumeread(handle);
-	}
-}
-
-static void
-tcp_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		   isc_region_t *region, void *cbarg) {
-	uint64_t magic = 0;
-
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-
-	if (eresult != ISC_R_SUCCESS) {
-		goto unref;
-	}
-
-	atomic_fetch_add(&sreads, 1);
-
-	memmove(tcp_buffer_storage + tcp_buffer_length, region->base,
-		region->length);
-	tcp_buffer_length += region->length;
-
-	if (tcp_buffer_length >= sizeof(magic)) {
-		isc_nm_pauseread(handle);
-
-		memmove(&magic, tcp_buffer_storage, sizeof(magic));
-		assert_true(magic == stop_magic || magic == send_magic);
-
-		tcp_buffer_length -= sizeof(magic);
-		memmove(tcp_buffer_storage, tcp_buffer_storage + sizeof(magic),
-			tcp_buffer_length);
-
-		if (magic == send_magic) {
-			isc_nm_send(handle, region, tcp_listen_send_cb, NULL);
-			return;
-		} else if (magic == stop_magic) {
-			/* We are done, so we don't send anything back */
-			/* There should be no more packets in the buffer */
-			assert_int_equal(tcp_buffer_length, 0);
-			if (atomic_load(&check_listener_quota)) {
-				int_fast32_t concurrent =
-					isc__nm_tcp_listener_nactive(
-						handle->sock->server->parent);
-				assert_true(concurrent >= 0);
-				assert_true((uint_fast32_t)concurrent <=
-					    isc_quota_getmax(&listener_quota));
-				P(concurrent);
-			}
-		}
-	}
-unref:
-	isc_nmhandle_detach(&handle);
-}
-
-static isc_result_t
-tcp_listen_accept_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
-	isc_nmhandle_t *readhandle = NULL;
-
-	UNUSED(cbarg);
-
-	if (result != ISC_R_SUCCESS) {
-		return (result);
-	}
-
-	tcp_buffer_length = 0;
-
-	atomic_fetch_add(&saccepts, 1);
-
-	if (atomic_load(&check_listener_quota)) {
-		int_fast32_t concurrent = isc__nm_tcp_listener_nactive(
-			handle->sock->server->parent);
-		assert_true(concurrent >= 0);
-		assert_true((uint_fast32_t)concurrent <=
-			    isc_quota_getmax(&listener_quota));
-		P(concurrent);
-	}
-
-	isc_nmhandle_attach(handle, &readhandle);
-	isc_nm_read(handle, tcp_listen_read_cb, NULL);
-
-	return (ISC_R_SUCCESS);
-}
-
-int
-main(void) {
-	const struct CMUnitTest tests[] = {
-		cmocka_unit_test_setup_teardown(tcp_recv_send_quota, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcp_recv_half_send_quota,
-						nm_setup, nm_teardown),
-		cmocka_unit_test_setup_teardown(tcp_half_recv_send_quota,
-						nm_setup, nm_teardown),
-		cmocka_unit_test_setup_teardown(tcp_half_recv_half_send_quota,
-						nm_setup, nm_teardown)
-	};
-
-	return (cmocka_run_group_tests(tests, _setup, _teardown));
-}
-
-#else /* HAVE_CMOCKA */
-
-#include <stdio.h>
-
-int
-main(void) {
-	printf("1..0 # Skipped: cmocka not available\n");
-	return (SKIPPED_TEST_EXIT_CODE);
-}
-
-#endif /* if HAVE_CMOCKA */
diff --git a/lib/isc/tests/tcp_test.c b/lib/isc/tests/tcp_test.c
deleted file mode 100644
index dc6aa5dcb8..0000000000
--- a/lib/isc/tests/tcp_test.c
+++ /dev/null
@@ -1,1048 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#if HAVE_CMOCKA
-#include <sched.h> /* IWYU pragma: keep */
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-#include <uv.h>
-
-#define UNIT_TESTING
-#include <cmocka.h>
-
-#include <isc/atomic.h>
-#include <isc/buffer.h>
-#include <isc/condition.h>
-#include <isc/mutex.h>
-#include <isc/netmgr.h>
-#include <isc/nonce.h>
-#include <isc/os.h>
-#include <isc/refcount.h>
-#include <isc/sockaddr.h>
-#include <isc/thread.h>
-
-#include "uv_wrap.h"
-#define KEEP_BEFORE
-
-#include "../netmgr/netmgr-int.h"
-#include "../netmgr/tcp.c"
-#include "../netmgr/uv-compat.c"
-#include "../netmgr/uv-compat.h"
-#include "isctest.h"
-
-#define MAX_NM 2
-
-static isc_sockaddr_t tcp_listen_addr;
-
-static uint64_t send_magic = 0;
-static uint64_t stop_magic = 0;
-
-static uv_buf_t send_msg = { .base = (char *)&send_magic,
-			     .len = sizeof(send_magic) };
-static uv_buf_t stop_msg = { .base = (char *)&stop_magic,
-			     .len = sizeof(stop_magic) };
-
-static atomic_uint_fast64_t nsends;
-
-static atomic_uint_fast64_t ssends;
-static atomic_uint_fast64_t sreads;
-
-static atomic_uint_fast64_t cconnects;
-static atomic_uint_fast64_t csends;
-static atomic_uint_fast64_t creads;
-static atomic_uint_fast64_t ctimeouts;
-
-static unsigned int workers = 3;
-
-static bool reuse_supported = true;
-
-#define NSENDS	100
-#define NWRITES 10
-
-#define CHECK_RANGE_FULL(v)                                       \
-	{                                                         \
-		int __v = atomic_load(&v);                        \
-		assert_true(__v > NSENDS * NWRITES * 10 / 100);   \
-		assert_true(__v <= NSENDS * NWRITES * 110 / 100); \
-	}
-
-#define CHECK_RANGE_HALF(v)                                       \
-	{                                                         \
-		int __v = atomic_load(&v);                        \
-		assert_true(__v > NSENDS * NWRITES * 5 / 100);    \
-		assert_true(__v <= NSENDS * NWRITES * 110 / 100); \
-	}
-
-/* Enable this to print values while running tests */
-#undef PRINT_DEBUG
-#ifdef PRINT_DEBUG
-#define X(v) fprintf(stderr, #v " = %" PRIu64 "\n", atomic_load(&v))
-#else
-#define X(v)
-#endif
-
-static int
-setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) {
-	isc_result_t result;
-	socklen_t addrlen = sizeof(*addr);
-	int fd;
-	int r;
-
-	isc_sockaddr_fromin6(addr, &in6addr_loopback, 0);
-
-	fd = socket(AF_INET6, family, 0);
-	if (fd < 0) {
-		perror("setup_ephemeral_port: socket()");
-		return (-1);
-	}
-
-	r = bind(fd, (const struct sockaddr *)&addr->type.sa,
-		 sizeof(addr->type.sin6));
-	if (r != 0) {
-		perror("setup_ephemeral_port: bind()");
-		close(fd);
-		return (r);
-	}
-
-	r = getsockname(fd, (struct sockaddr *)&addr->type.sa, &addrlen);
-	if (r != 0) {
-		perror("setup_ephemeral_port: getsockname()");
-		close(fd);
-		return (r);
-	}
-
-	result = isc__nm_socket_reuse(fd);
-	if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) {
-		fprintf(stderr,
-			"setup_ephemeral_port: isc__nm_socket_reuse(): %s",
-			isc_result_totext(result));
-		close(fd);
-		return (-1);
-	}
-
-	result = isc__nm_socket_reuse_lb(fd);
-	if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) {
-		fprintf(stderr,
-			"setup_ephemeral_port: isc__nm_socket_reuse_lb(): %s",
-			isc_result_totext(result));
-		close(fd);
-		return (-1);
-	}
-	if (result == ISC_R_NOTIMPLEMENTED) {
-		reuse_supported = false;
-	}
-
-#if IPV6_RECVERR
-#define setsockopt_on(socket, level, name) \
-	setsockopt(socket, level, name, &(int){ 1 }, sizeof(int))
-
-	r = setsockopt_on(fd, IPPROTO_IPV6, IPV6_RECVERR);
-	if (r != 0) {
-		perror("setup_ephemeral_port");
-		close(fd);
-		return (r);
-	}
-#endif
-
-	return (fd);
-}
-
-static int
-_setup(void **state) {
-	UNUSED(state);
-
-	/* workers = isc_os_ncpus(); */
-
-	if (isc_test_begin(NULL, true, workers) != ISC_R_SUCCESS) {
-		return (-1);
-	}
-
-	signal(SIGPIPE, SIG_IGN);
-
-	return (0);
-}
-
-static int
-_teardown(void **state) {
-	UNUSED(state);
-
-	isc_test_end();
-
-	return (0);
-}
-
-/* Generic */
-
-static unsigned int
-noop_accept_cb(isc_nmhandle_t *handle, unsigned int result, void *cbarg) {
-	UNUSED(handle);
-	UNUSED(result);
-	UNUSED(cbarg);
-
-	return (0);
-}
-
-static void
-noop_connect_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
-	UNUSED(handle);
-	UNUSED(result);
-	UNUSED(cbarg);
-}
-
-thread_local uint8_t tcp_buffer_storage[4096];
-thread_local size_t tcp_buffer_length = 0;
-
-static int
-nm_setup(void **state) {
-	size_t nworkers = ISC_MAX(ISC_MIN(workers, 32), 1);
-	int tcp_listen_sock = -1;
-	isc_nm_t **nm = NULL;
-
-	tcp_listen_addr = (isc_sockaddr_t){ .length = 0 };
-	tcp_listen_sock = setup_ephemeral_port(&tcp_listen_addr, SOCK_STREAM);
-	if (tcp_listen_sock < 0) {
-		return (-1);
-	}
-	close(tcp_listen_sock);
-	tcp_listen_sock = -1;
-
-	atomic_store(&nsends, NSENDS * NWRITES);
-
-	atomic_store(&csends, 0);
-	atomic_store(&creads, 0);
-	atomic_store(&sreads, 0);
-	atomic_store(&ssends, 0);
-	atomic_store(&ctimeouts, 0);
-	atomic_store(&cconnects, 0);
-
-	isc_nonce_buf(&send_magic, sizeof(send_magic));
-	isc_nonce_buf(&stop_magic, sizeof(stop_magic));
-	if (send_magic == stop_magic) {
-		return (-1);
-	}
-
-	nm = isc_mem_get(test_mctx, MAX_NM * sizeof(nm[0]));
-	for (size_t i = 0; i < MAX_NM; i++) {
-		nm[i] = isc_nm_start(test_mctx, nworkers);
-		assert_non_null(nm[i]);
-	}
-
-	*state = nm;
-
-	return (0);
-}
-
-static int
-nm_teardown(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-
-	for (size_t i = 0; i < MAX_NM; i++) {
-		isc_nm_destroy(&nm[i]);
-		assert_null(nm[i]);
-	}
-	isc_mem_put(test_mctx, nm, MAX_NM * sizeof(nm[0]));
-
-	return (0);
-}
-
-thread_local size_t nwrites = NWRITES;
-
-/* TCP Connect */
-
-static void
-tcp_connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg);
-
-static void
-tcp_connect_send(isc_nmhandle_t *handle);
-
-static void
-tcp_connect_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		    isc_region_t *region, void *cbarg) {
-	uint64_t magic = 0;
-
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-	if (eresult != ISC_R_SUCCESS) {
-		goto unref;
-	}
-
-	memmove(tcp_buffer_storage + tcp_buffer_length, region->base,
-		region->length);
-	tcp_buffer_length += region->length;
-
-	while (tcp_buffer_length >= sizeof(magic)) {
-		atomic_fetch_add(&creads, 1);
-
-		memmove(&magic, tcp_buffer_storage, sizeof(magic));
-		assert_true(magic == stop_magic || magic == send_magic);
-
-		tcp_buffer_length -= sizeof(magic);
-		memmove(tcp_buffer_storage, tcp_buffer_storage + sizeof(magic),
-			tcp_buffer_length);
-
-		if (magic == send_magic) {
-			tcp_connect_send(handle);
-			return;
-		} else if (magic == stop_magic) {
-			/* We are done, so we don't send anything back */
-			/* There should be no more packets in the buffer */
-			assert_int_equal(tcp_buffer_length, 0);
-		}
-	}
-unref:
-	isc_nmhandle_detach(&handle);
-}
-
-static void
-tcp_connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
-	assert_non_null(handle);
-	UNUSED(cbarg);
-
-	if (eresult == ISC_R_SUCCESS) {
-		atomic_fetch_add(&csends, 1);
-		isc_nm_resumeread(handle);
-	} else {
-		/* Send failed, we need to stop reading too */
-		isc_nm_cancelread(handle);
-	}
-}
-
-static void
-tcp_connect_shutdown(isc_nmhandle_t *handle, isc_result_t eresult,
-		     void *cbarg) {
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-
-	if (eresult == ISC_R_SUCCESS) {
-		atomic_fetch_add(&csends, 1);
-	} else {
-		/* Send failed, we need to stop reading too */
-		isc_nm_cancelread(handle);
-	}
-}
-
-static void
-tcp_connect_send(isc_nmhandle_t *handle) {
-	uint_fast64_t sends = atomic_load(&nsends);
-
-	while (sends > 0) {
-		/* Continue until we subtract or we are done */
-		if (atomic_compare_exchange_weak(&nsends, &sends, sends - 1)) {
-			sends--;
-			break;
-		}
-	}
-
-	if (sends == 0) {
-		isc_nm_send(handle, (isc_region_t *)&stop_msg,
-			    tcp_connect_shutdown, NULL);
-	} else {
-		isc_nm_send(handle, (isc_region_t *)&send_msg,
-			    tcp_connect_send_cb, NULL);
-	}
-}
-
-static void
-tcp_connect_connect_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		       void *cbarg) {
-	isc_nmhandle_t *readhandle = NULL;
-
-	UNUSED(cbarg);
-
-	if (eresult != ISC_R_SUCCESS) {
-		uint_fast64_t sends = atomic_load(&nsends);
-
-		/* We failed to connect; try again */
-		while (sends > 0) {
-			/* Continue until we subtract or we are done */
-			if (atomic_compare_exchange_weak(&nsends, &sends,
-							 sends - 1)) {
-				sends--;
-				break;
-			}
-		}
-		return;
-	}
-
-	atomic_fetch_add(&cconnects, 1);
-
-	isc_nmhandle_attach(handle, &readhandle);
-	isc_nm_read(handle, tcp_connect_read_cb, NULL);
-
-	tcp_connect_send(handle);
-}
-
-static void
-mock_listentcp_uv_tcp_bind(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_tcp_bind, UV_EADDRINUSE);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  noop_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-	assert_null(listen_sock);
-
-	RESET_RETURN;
-}
-
-static void
-mock_listentcp_uv_fileno(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_fileno, UV_EADDRINUSE);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  noop_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-	assert_null(listen_sock);
-
-	RESET_RETURN;
-}
-
-static void
-mock_listentcp_uv_tcp_getsockname(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_tcp_getsockname, UV_EADDRINUSE);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  noop_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-	assert_null(listen_sock);
-
-	RESET_RETURN;
-}
-
-static void
-mock_listentcp_uv_listen(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_listen, UV_EADDRINUSE);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  noop_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-	assert_null(listen_sock);
-
-	RESET_RETURN;
-}
-
-static void
-mock_tcpconnect_uv_tcp_bind(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_tcp_bind, UV_ENOMEM);
-
-	result = isc_nm_tcpconnect(connect_nm,
-				   (isc_nmiface_t *)&tcp_connect_addr,
-				   (isc_nmiface_t *)&tcp_listen_addr,
-				   noop_connect_cb, NULL, 1000, 0);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-
-	isc_nm_closedown(connect_nm);
-
-	RESET_RETURN;
-}
-
-static void
-mock_tcpconnect_uv_tcp_connect(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_tcp_connect, UV_ENOMEM);
-
-	result = isc_nm_tcpconnect(
-		connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
-		(isc_nmiface_t *)&tcp_listen_addr, noop_connect_cb, NULL, 1, 0);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-
-	isc_nm_closedown(connect_nm);
-
-	RESET_RETURN;
-}
-
-static void
-tcp_noop(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  noop_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	(void)isc_nm_tcpconnect(connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
-				(isc_nmiface_t *)&tcp_listen_addr,
-				noop_connect_cb, NULL, 1, 0);
-
-	isc_nm_closedown(connect_nm);
-
-	assert_int_equal(0, atomic_load(&cconnects));
-	assert_int_equal(0, atomic_load(&csends));
-	assert_int_equal(0, atomic_load(&creads));
-	assert_int_equal(0, atomic_load(&ctimeouts));
-	assert_int_equal(0, atomic_load(&sreads));
-	assert_int_equal(0, atomic_load(&ssends));
-}
-
-static void
-tcp_noresponse(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  noop_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	(void)isc_nm_tcpconnect(connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
-				(isc_nmiface_t *)&tcp_listen_addr,
-				tcp_connect_connect_cb, NULL, 1, 0);
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-	isc_nm_closedown(connect_nm);
-}
-
-static isc_result_t
-tcp_listen_accept_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg);
-
-static isc_threadresult_t
-tcp_connect_thread(isc_threadarg_t arg) {
-	isc_nm_t *connect_nm = (isc_nm_t *)arg;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	while (atomic_load(&nsends) > 0) {
-		(void)isc_nm_tcpconnect(connect_nm,
-					(isc_nmiface_t *)&tcp_connect_addr,
-					(isc_nmiface_t *)&tcp_listen_addr,
-					tcp_connect_connect_cb, NULL, 1, 0);
-	}
-
-	return ((isc_threadresult_t)0);
-}
-
-static void
-tcp_recv_one(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	atomic_store(&nsends, 1);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  tcp_listen_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	(void)isc_nm_tcpconnect(connect_nm, (isc_nmiface_t *)&tcp_connect_addr,
-				(isc_nmiface_t *)&tcp_listen_addr,
-				tcp_connect_connect_cb, NULL, 1000, 0);
-
-	while (atomic_load(&nsends) > 0) {
-		isc_thread_yield();
-	}
-
-	while (atomic_load(&cconnects) != 1 || atomic_load(&ssends) != 0 ||
-	       atomic_load(&sreads) != 1 || atomic_load(&creads) != 0 ||
-	       atomic_load(&csends) != 1)
-	{
-		isc_thread_yield();
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_int_equal(atomic_load(&cconnects), 1);
-	assert_int_equal(atomic_load(&csends), 1);
-	assert_int_equal(atomic_load(&creads), 0);
-	assert_int_equal(atomic_load(&ctimeouts), 0);
-	assert_int_equal(atomic_load(&sreads), 1);
-	assert_int_equal(atomic_load(&ssends), 0);
-}
-
-static void
-tcp_recv_two(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcp_connect_addr;
-
-	tcp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcp_connect_addr, &in6addr_loopback, 0);
-
-	atomic_store(&nsends, 2);
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  tcp_listen_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	result = isc_nm_tcpconnect(connect_nm,
-				   (isc_nmiface_t *)&tcp_connect_addr,
-				   (isc_nmiface_t *)&tcp_listen_addr,
-				   tcp_connect_connect_cb, NULL, 1000, 0);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	while (atomic_load(&nsends) > 0) {
-		isc_thread_yield();
-	}
-
-	while (atomic_load(&sreads) < 2 || atomic_load(&ssends) < 1 ||
-	       atomic_load(&csends) < 2 || atomic_load(&creads) < 1)
-	{
-		isc_thread_yield();
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_int_equal(atomic_load(&cconnects), 1);
-	assert_true(atomic_load(&csends) >= 2);
-	assert_int_equal(atomic_load(&creads), 1);
-	assert_int_equal(atomic_load(&ctimeouts), 0);
-	assert_true(atomic_load(&sreads) >= 2);
-	assert_int_equal(atomic_load(&ssends), 1);
-}
-
-static void
-tcp_recv_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  tcp_listen_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_closedown(connect_nm);
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_FULL(csends);
-	CHECK_RANGE_FULL(creads);
-	CHECK_RANGE_FULL(sreads);
-	CHECK_RANGE_FULL(ssends);
-}
-
-static void
-tcp_recv_half_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  tcp_listen_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_closedown(connect_nm);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_HALF(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-
-static void
-tcp_half_recv_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  tcp_listen_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_HALF(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-
-static void
-tcp_half_recv_half_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentcp(listen_nm, (isc_nmiface_t *)&tcp_listen_addr,
-				  tcp_listen_accept_cb, NULL, 0, 0, NULL,
-				  &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_closedown(connect_nm);
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_HALF(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-
-/* TCP Listener */
-
-/*
- * TODO:
- * 1. write a timeout test
- * 2. write a test with quota
- */
-
-static void
-tcp_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		   isc_region_t *region, void *cbarg);
-
-static void
-tcp_listen_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
-	UNUSED(eresult);
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-
-	if (eresult == ISC_R_SUCCESS) {
-		atomic_fetch_add(&ssends, 1);
-		isc_nm_resumeread(handle);
-	} else {
-		isc_nm_cancelread(handle);
-	}
-}
-
-static void
-tcp_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		   isc_region_t *region, void *cbarg) {
-	uint64_t magic = 0;
-
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-
-	if (eresult != ISC_R_SUCCESS) {
-		goto unref;
-	}
-
-	atomic_fetch_add(&sreads, 1);
-
-	memmove(tcp_buffer_storage + tcp_buffer_length, region->base,
-		region->length);
-	tcp_buffer_length += region->length;
-
-	while (tcp_buffer_length >= sizeof(magic)) {
-		memmove(&magic, tcp_buffer_storage, sizeof(magic));
-		assert_true(magic == stop_magic || magic == send_magic);
-
-		tcp_buffer_length -= sizeof(magic);
-		memmove(tcp_buffer_storage, tcp_buffer_storage + sizeof(magic),
-			tcp_buffer_length);
-
-		if (magic == send_magic) {
-			isc_nm_send(handle, region, tcp_listen_send_cb, NULL);
-			return;
-		} else if (magic == stop_magic) {
-			/* We are done, so we don't send anything back */
-			/* There should be no more packets in the buffer */
-			assert_int_equal(tcp_buffer_length, 0);
-		}
-	}
-
-unref:
-	isc_nmhandle_detach(&handle);
-}
-
-static isc_result_t
-tcp_listen_accept_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
-	isc_nmhandle_t *readhandle = NULL;
-
-	UNUSED(cbarg);
-
-	if (result != ISC_R_SUCCESS) {
-		return (result);
-	}
-
-	tcp_buffer_length = 0;
-
-	/* atomic_fetch_add(&saccept, 1); */
-
-	isc_nmhandle_attach(handle, &readhandle);
-	isc_nm_read(handle, tcp_listen_read_cb, NULL);
-
-	return (ISC_R_SUCCESS);
-}
-
-int
-main(void) {
-	const struct CMUnitTest tests[] = {
-		cmocka_unit_test_setup_teardown(mock_listentcp_uv_tcp_bind,
-						nm_setup, nm_teardown),
-		cmocka_unit_test_setup_teardown(mock_listentcp_uv_fileno,
-						nm_setup, nm_teardown),
-		cmocka_unit_test_setup_teardown(
-			mock_listentcp_uv_tcp_getsockname, nm_setup,
-			nm_teardown),
-		cmocka_unit_test_setup_teardown(mock_listentcp_uv_listen,
-						nm_setup, nm_teardown),
-		cmocka_unit_test_setup_teardown(mock_tcpconnect_uv_tcp_bind,
-						nm_setup, nm_teardown),
-		cmocka_unit_test_setup_teardown(mock_tcpconnect_uv_tcp_connect,
-						nm_setup, nm_teardown),
-		cmocka_unit_test_setup_teardown(tcp_noop, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcp_noresponse, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcp_recv_one, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcp_recv_two, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcp_recv_send, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcp_recv_half_send, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcp_half_recv_send, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcp_half_recv_half_send,
-						nm_setup, nm_teardown),
-	};
-
-	return (cmocka_run_group_tests(tests, _setup, _teardown));
-}
-
-#else /* HAVE_CMOCKA */
-
-#include <stdio.h>
-
-int
-main(void) {
-	printf("1..0 # Skipped: cmocka not available\n");
-	return (SKIPPED_TEST_EXIT_CODE);
-}
-
-#endif /* if HAVE_CMOCKA */
diff --git a/lib/isc/tests/tcpdns_test.c b/lib/isc/tests/tcpdns_test.c
deleted file mode 100644
index 30e12f9dd9..0000000000
--- a/lib/isc/tests/tcpdns_test.c
+++ /dev/null
@@ -1,878 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#if HAVE_CMOCKA
-#include <sched.h> /* IWYU pragma: keep */
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-#include <uv.h>
-
-#define UNIT_TESTING
-#include <cmocka.h>
-
-#include <isc/atomic.h>
-#include <isc/buffer.h>
-#include <isc/condition.h>
-#include <isc/mutex.h>
-#include <isc/netmgr.h>
-#include <isc/nonce.h>
-#include <isc/os.h>
-#include <isc/refcount.h>
-#include <isc/sockaddr.h>
-#include <isc/thread.h>
-
-#include "../netmgr/netmgr-int.h"
-#include "isctest.h"
-
-#define MAX_NM 2
-
-static isc_sockaddr_t tcpdns_listen_addr;
-
-static uint64_t send_magic = 0;
-static uint64_t stop_magic = 0;
-
-static uv_buf_t send_msg = { .base = (char *)&send_magic,
-			     .len = sizeof(send_magic) };
-
-static uv_buf_t stop_msg = { .base = (char *)&stop_magic,
-			     .len = sizeof(stop_magic) };
-
-static atomic_uint_fast64_t nsends;
-
-static atomic_uint_fast64_t ssends;
-static atomic_uint_fast64_t sreads;
-
-static atomic_uint_fast64_t cconnects;
-static atomic_uint_fast64_t csends;
-static atomic_uint_fast64_t creads;
-static atomic_uint_fast64_t ctimeouts;
-
-static unsigned int workers = 3;
-
-static bool reuse_supported = true;
-
-#define NSENDS	100
-#define NWRITES 10
-
-#define CHECK_RANGE_FULL(v)                                       \
-	{                                                         \
-		int __v = atomic_load(&v);                        \
-		assert_true(__v > NSENDS * NWRITES * 10 / 100);   \
-		assert_true(__v <= NSENDS * NWRITES * 110 / 100); \
-	}
-
-#define CHECK_RANGE_HALF(v)                                      \
-	{                                                        \
-		int __v = atomic_load(&v);                       \
-		assert_true(__v > NSENDS * NWRITES * 5 / 100);   \
-		assert_true(__v <= NSENDS * NWRITES * 60 / 100); \
-	}
-
-/* Enable this to print values while running tests */
-#undef PRINT_DEBUG
-#ifdef PRINT_DEBUG
-#define X(v) fprintf(stderr, #v " = %" PRIu64 "\n", atomic_load(&v))
-#else
-#define X(v)
-#endif
-
-static int
-setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) {
-	isc_result_t result;
-	socklen_t addrlen = sizeof(*addr);
-	int fd;
-	int r;
-
-	isc_sockaddr_fromin6(addr, &in6addr_loopback, 0);
-
-	fd = socket(AF_INET6, family, 0);
-	if (fd < 0) {
-		perror("setup_ephemeral_port: socket()");
-		return (-1);
-	}
-
-	r = bind(fd, (const struct sockaddr *)&addr->type.sa,
-		 sizeof(addr->type.sin6));
-	if (r != 0) {
-		perror("setup_ephemeral_port: bind()");
-		close(fd);
-		return (r);
-	}
-
-	r = getsockname(fd, (struct sockaddr *)&addr->type.sa, &addrlen);
-	if (r != 0) {
-		perror("setup_ephemeral_port: getsockname()");
-		close(fd);
-		return (r);
-	}
-
-	result = isc__nm_socket_reuse(fd);
-	if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) {
-		fprintf(stderr,
-			"setup_ephemeral_port: isc__nm_socket_reuse(): %s",
-			isc_result_totext(result));
-		close(fd);
-		return (-1);
-	}
-
-	result = isc__nm_socket_reuse_lb(fd);
-	if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) {
-		fprintf(stderr,
-			"setup_ephemeral_port: isc__nm_socket_reuse_lb(): %s",
-			isc_result_totext(result));
-		close(fd);
-		return (-1);
-	}
-	if (result == ISC_R_NOTIMPLEMENTED) {
-		reuse_supported = false;
-	}
-
-#if IPV6_RECVERR
-#define setsockopt_on(socket, level, name) \
-	setsockopt(socket, level, name, &(int){ 1 }, sizeof(int))
-
-	r = setsockopt_on(fd, IPPROTO_IPV6, IPV6_RECVERR);
-	if (r != 0) {
-		perror("setup_ephemeral_port");
-		close(fd);
-		return (r);
-	}
-#endif
-
-	return (fd);
-}
-
-static int
-_setup(void **state) {
-	UNUSED(state);
-
-	/* workers = isc_os_ncpus(); */
-
-	if (isc_test_begin(NULL, true, workers) != ISC_R_SUCCESS) {
-		return (-1);
-	}
-
-	signal(SIGPIPE, SIG_IGN);
-
-	return (0);
-}
-
-static int
-_teardown(void **state) {
-	UNUSED(state);
-
-	isc_test_end();
-
-	return (0);
-}
-
-/* Generic */
-
-static void
-noop_recv_cb(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
-	     void *cbarg) {
-	UNUSED(handle);
-	UNUSED(eresult);
-	UNUSED(region);
-	UNUSED(cbarg);
-}
-
-static unsigned int
-noop_accept_cb(isc_nmhandle_t *handle, unsigned int result, void *cbarg) {
-	UNUSED(handle);
-	UNUSED(result);
-	UNUSED(cbarg);
-
-	return (0);
-}
-
-static void
-noop_connect_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
-	UNUSED(handle);
-	UNUSED(result);
-	UNUSED(cbarg);
-}
-
-thread_local uint8_t tcpdns_buffer_storage[4096];
-thread_local size_t tcpdns_buffer_length = 0;
-
-static int
-nm_setup(void **state) {
-	size_t nworkers = ISC_MAX(ISC_MIN(workers, 32), 1);
-	int tcpdns_listen_sock = -1;
-	isc_nm_t **nm = NULL;
-
-	tcpdns_listen_addr = (isc_sockaddr_t){ .length = 0 };
-	tcpdns_listen_sock = setup_ephemeral_port(&tcpdns_listen_addr,
-						  SOCK_STREAM);
-	if (tcpdns_listen_sock < 0) {
-		return (-1);
-	}
-	close(tcpdns_listen_sock);
-	tcpdns_listen_sock = -1;
-
-	atomic_store(&nsends, NSENDS * NWRITES);
-
-	atomic_store(&csends, 0);
-	atomic_store(&creads, 0);
-	atomic_store(&sreads, 0);
-	atomic_store(&ssends, 0);
-	atomic_store(&ctimeouts, 0);
-	atomic_store(&cconnects, 0);
-
-	isc_nonce_buf(&send_magic, sizeof(send_magic));
-	isc_nonce_buf(&stop_magic, sizeof(stop_magic));
-	if (send_magic == stop_magic) {
-		return (-1);
-	}
-
-	nm = isc_mem_get(test_mctx, MAX_NM * sizeof(nm[0]));
-	for (size_t i = 0; i < MAX_NM; i++) {
-		nm[i] = isc_nm_start(test_mctx, nworkers);
-		assert_non_null(nm[i]);
-	}
-
-	*state = nm;
-
-	return (0);
-}
-
-static int
-nm_teardown(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-
-	for (size_t i = 0; i < MAX_NM; i++) {
-		isc_nm_destroy(&nm[i]);
-		assert_null(nm[i]);
-	}
-	isc_mem_put(test_mctx, nm, MAX_NM * sizeof(nm[0]));
-
-	return (0);
-}
-
-thread_local size_t nwrites = NWRITES;
-
-/* TCPDNS */
-
-static void
-tcpdns_connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		       void *cbarg);
-
-static void
-tcpdns_connect_send(isc_nmhandle_t *handle);
-
-static void
-tcpdns_connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		       void *cbarg) {
-	assert_non_null(handle);
-
-	UNUSED(cbarg);
-
-	if (eresult == ISC_R_SUCCESS) {
-		atomic_fetch_add(&csends, 1);
-	} else {
-		/* Send failed, we need to stop reading too */
-		isc_nm_cancelread(handle);
-	}
-}
-
-static void
-tcpdns_connect_send(isc_nmhandle_t *handle) {
-	uint_fast64_t sends = atomic_load(&nsends);
-
-	/* Continue until we subtract or we are sent them all */
-	while (sends > 0) {
-		if (atomic_compare_exchange_weak(&nsends, &sends, sends - 1)) {
-			sends--;
-			break;
-		}
-	}
-
-	if (sends == 0) {
-		isc_nm_send(handle, (isc_region_t *)&stop_msg,
-			    tcpdns_connect_send_cb, NULL);
-	} else {
-		isc_nm_send(handle, (isc_region_t *)&send_msg,
-			    tcpdns_connect_send_cb, NULL);
-	}
-}
-
-static void
-tcpdns_connect_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		       isc_region_t *region, void *cbarg) {
-	uint64_t magic = 0;
-
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-
-	if (eresult != ISC_R_SUCCESS) {
-		goto unref;
-	}
-
-	assert_int_equal(region->length, sizeof(magic));
-
-	atomic_fetch_add(&creads, 1);
-
-	memmove(&magic, region->base, sizeof(magic));
-
-	assert_true(magic == stop_magic || magic == send_magic);
-
-unref:
-	isc_nmhandle_detach(&handle);
-}
-
-static void
-tcpdns_connect_connect_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-			  void *cbarg) {
-	isc_nmhandle_t *readhandle = NULL;
-	UNUSED(cbarg);
-
-	if (eresult != ISC_R_SUCCESS) {
-		uint_fast64_t sends = atomic_load(&nsends);
-
-		/* We failed to connect; try again */
-		while (sends > 0) {
-			/* Continue until we subtract or we are done */
-			if (atomic_compare_exchange_weak(&nsends, &sends,
-							 sends - 1)) {
-				sends--;
-				break;
-			}
-		}
-		return;
-	}
-
-	atomic_fetch_add(&cconnects, 1);
-
-	isc_nmhandle_attach(handle, &readhandle);
-	isc_nm_read(handle, tcpdns_connect_read_cb, NULL);
-
-	tcpdns_connect_send(handle);
-}
-
-static void
-tcpdns_noop(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcpdns_connect_addr;
-
-	tcpdns_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcpdns_connect_addr, &in6addr_loopback, 0);
-
-	result = isc_nm_listentcpdns(
-		listen_nm, (isc_nmiface_t *)&tcpdns_listen_addr, noop_recv_cb,
-		NULL, noop_accept_cb, NULL, 0, 0, NULL, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	(void)isc_nm_tcpdnsconnect(connect_nm,
-				   (isc_nmiface_t *)&tcpdns_connect_addr,
-				   (isc_nmiface_t *)&tcpdns_listen_addr,
-				   noop_connect_cb, NULL, 1000, 0);
-	isc_nm_closedown(connect_nm);
-
-	assert_int_equal(0, atomic_load(&cconnects));
-	assert_int_equal(0, atomic_load(&csends));
-	assert_int_equal(0, atomic_load(&creads));
-	assert_int_equal(0, atomic_load(&ctimeouts));
-	assert_int_equal(0, atomic_load(&sreads));
-	assert_int_equal(0, atomic_load(&ssends));
-}
-
-static void
-tcpdns_noresponse(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcpdns_connect_addr;
-
-	tcpdns_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcpdns_connect_addr, &in6addr_loopback, 0);
-
-	result = isc_nm_listentcpdns(
-		listen_nm, (isc_nmiface_t *)&tcpdns_listen_addr, noop_recv_cb,
-		NULL, noop_accept_cb, NULL, 0, 0, NULL, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	(void)isc_nm_tcpdnsconnect(connect_nm,
-				   (isc_nmiface_t *)&tcpdns_connect_addr,
-				   (isc_nmiface_t *)&tcpdns_listen_addr,
-				   tcpdns_connect_connect_cb, NULL, 1000, 0);
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_true(atomic_load(&cconnects) <= 1);
-	assert_true(atomic_load(&csends) <= 1);
-	assert_int_equal(0, atomic_load(&creads));
-	assert_int_equal(0, atomic_load(&ctimeouts));
-	assert_int_equal(0, atomic_load(&sreads));
-	assert_int_equal(0, atomic_load(&ssends));
-}
-
-static void
-tcpdns_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		      isc_region_t *region, void *cbarg);
-
-static void
-tcpdns_listen_send_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		      void *cbarg) {
-	UNUSED(cbarg);
-	UNUSED(eresult);
-
-	assert_non_null(handle);
-
-	if (eresult != ISC_R_SUCCESS) {
-		return;
-	}
-
-	atomic_fetch_add(&ssends, 1);
-}
-
-static void
-tcpdns_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		      isc_region_t *region, void *cbarg) {
-	uint64_t magic = 0;
-
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-
-	if (eresult != ISC_R_SUCCESS) {
-		return;
-	}
-
-	atomic_fetch_add(&sreads, 1);
-
-	assert_int_equal(region->length, sizeof(magic));
-
-	memmove(&magic, region->base, sizeof(magic));
-	assert_true(magic == stop_magic || magic == send_magic);
-
-	if (magic == send_magic) {
-		isc_nm_send(handle, region, tcpdns_listen_send_cb, NULL);
-		return;
-	} else if (magic == stop_magic) {
-		/* We are done, we don't send anything back */
-	}
-}
-
-static isc_result_t
-tcpdns_listen_accept_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-			void *cbarg) {
-	UNUSED(handle);
-	UNUSED(cbarg);
-
-	return (eresult);
-}
-
-static isc_threadresult_t
-tcpdns_connect_thread(isc_threadarg_t arg) {
-	isc_nm_t *connect_nm = (isc_nm_t *)arg;
-	isc_sockaddr_t tcpdns_connect_addr;
-
-	tcpdns_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcpdns_connect_addr, &in6addr_loopback, 0);
-
-	while (atomic_load(&nsends) > 0) {
-		(void)isc_nm_tcpdnsconnect(
-			connect_nm, (isc_nmiface_t *)&tcpdns_connect_addr,
-			(isc_nmiface_t *)&tcpdns_listen_addr,
-			tcpdns_connect_connect_cb, NULL, 1000, 0);
-	}
-
-	return ((isc_threadresult_t)0);
-}
-
-static void
-tcpdns_recv_one(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcpdns_connect_addr;
-
-	tcpdns_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcpdns_connect_addr, &in6addr_loopback, 0);
-
-	atomic_store(&nsends, 1);
-
-	result = isc_nm_listentcpdns(
-		listen_nm, (isc_nmiface_t *)&tcpdns_listen_addr,
-		tcpdns_listen_read_cb, NULL, tcpdns_listen_accept_cb, NULL, 0,
-		0, NULL, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	(void)isc_nm_tcpdnsconnect(connect_nm,
-				   (isc_nmiface_t *)&tcpdns_connect_addr,
-				   (isc_nmiface_t *)&tcpdns_listen_addr,
-				   tcpdns_connect_connect_cb, NULL, 1000, 0);
-
-	while (atomic_load(&nsends) > 0) {
-		isc_thread_yield();
-	}
-
-	while (atomic_load(&cconnects) != 1 || atomic_load(&ssends) != 0 ||
-	       atomic_load(&sreads) != 1 || atomic_load(&creads) != 0 ||
-	       atomic_load(&csends) != 1)
-	{
-		isc_thread_yield();
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_int_equal(atomic_load(&cconnects), 1);
-	assert_int_equal(atomic_load(&csends), 1);
-	assert_int_equal(atomic_load(&creads), 0);
-	assert_int_equal(atomic_load(&ctimeouts), 0);
-	assert_int_equal(atomic_load(&sreads), 1);
-	assert_int_equal(atomic_load(&ssends), 0);
-}
-
-static void
-tcpdns_recv_two(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tcpdns_connect_addr;
-
-	tcpdns_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tcpdns_connect_addr, &in6addr_loopback, 0);
-
-	atomic_store(&nsends, 2);
-
-	result = isc_nm_listentcpdns(
-		listen_nm, (isc_nmiface_t *)&tcpdns_listen_addr,
-		tcpdns_listen_read_cb, NULL, tcpdns_listen_accept_cb, NULL, 0,
-		0, NULL, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	result = isc_nm_tcpdnsconnect(connect_nm,
-				      (isc_nmiface_t *)&tcpdns_connect_addr,
-				      (isc_nmiface_t *)&tcpdns_listen_addr,
-				      tcpdns_connect_connect_cb, NULL, 1000, 0);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	isc_nm_settimeouts(connect_nm, 1000, 1000, 1000, 1000);
-
-	result = isc_nm_tcpdnsconnect(connect_nm,
-				      (isc_nmiface_t *)&tcpdns_connect_addr,
-				      (isc_nmiface_t *)&tcpdns_listen_addr,
-				      tcpdns_connect_connect_cb, NULL, 1000, 0);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	while (atomic_load(&nsends) > 0) {
-		isc_thread_yield();
-	}
-
-	while (atomic_load(&sreads) != 2 || atomic_load(&ssends) != 1 ||
-	       atomic_load(&csends) != 2 || atomic_load(&creads) != 1)
-	{
-		isc_thread_yield();
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_int_equal(atomic_load(&cconnects), 2);
-	assert_int_equal(atomic_load(&csends), 2);
-	assert_int_equal(atomic_load(&creads), 1);
-	assert_int_equal(atomic_load(&ctimeouts), 0);
-	assert_int_equal(atomic_load(&sreads), 2);
-	assert_int_equal(atomic_load(&ssends), 1);
-}
-
-static void
-tcpdns_recv_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentcpdns(
-		listen_nm, (isc_nmiface_t *)&tcpdns_listen_addr,
-		tcpdns_listen_read_cb, NULL, tcpdns_listen_accept_cb, NULL, 0,
-		0, NULL, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcpdns_connect_thread, connect_nm,
-				  &threads[i]);
-	}
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_closedown(connect_nm);
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_FULL(csends);
-	CHECK_RANGE_FULL(creads);
-	CHECK_RANGE_FULL(sreads);
-	CHECK_RANGE_FULL(ssends);
-}
-
-static void
-tcpdns_recv_half_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentcpdns(
-		listen_nm, (isc_nmiface_t *)&tcpdns_listen_addr,
-		tcpdns_listen_read_cb, NULL, tcpdns_listen_accept_cb, NULL, 0,
-		0, NULL, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcpdns_connect_thread, connect_nm,
-				  &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_closedown(connect_nm);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_HALF(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-
-static void
-tcpdns_half_recv_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentcpdns(
-		listen_nm, (isc_nmiface_t *)&tcpdns_listen_addr,
-		tcpdns_listen_read_cb, NULL, tcpdns_listen_accept_cb, NULL, 0,
-		0, NULL, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcpdns_connect_thread, connect_nm,
-				  &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_HALF(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-
-static void
-tcpdns_half_recv_half_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentcpdns(
-		listen_nm, (isc_nmiface_t *)&tcpdns_listen_addr,
-		tcpdns_listen_read_cb, NULL, tcpdns_listen_accept_cb, NULL, 0,
-		0, NULL, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tcpdns_connect_thread, connect_nm,
-				  &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_closedown(connect_nm);
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_HALF(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-
-int
-main(void) {
-	const struct CMUnitTest tests[] = {
-		cmocka_unit_test_setup_teardown(tcpdns_recv_one, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcpdns_recv_two, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcpdns_noop, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcpdns_noresponse, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcpdns_recv_send, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcpdns_recv_half_send, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcpdns_half_recv_send, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tcpdns_half_recv_half_send,
-						nm_setup, nm_teardown),
-	};
-
-	return (cmocka_run_group_tests(tests, _setup, _teardown));
-}
-
-#else /* HAVE_CMOCKA */
-
-#include <stdio.h>
-
-int
-main(void) {
-	printf("1..0 # Skipped: cmocka not available\n");
-	return (SKIPPED_TEST_EXIT_CODE);
-}
-
-#endif /* if HAVE_CMOCKA */
diff --git a/lib/isc/tests/tlsdns_test.c b/lib/isc/tests/tlsdns_test.c
deleted file mode 100644
index 59329fb049..0000000000
--- a/lib/isc/tests/tlsdns_test.c
+++ /dev/null
@@ -1,903 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#if HAVE_CMOCKA
-#include <sched.h> /* IWYU pragma: keep */
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-#include <uv.h>
-
-#define UNIT_TESTING
-#include <cmocka.h>
-
-#include <isc/atomic.h>
-#include <isc/buffer.h>
-#include <isc/condition.h>
-#include <isc/mutex.h>
-#include <isc/netmgr.h>
-#include <isc/nonce.h>
-#include <isc/os.h>
-#include <isc/refcount.h>
-#include <isc/sockaddr.h>
-#include <isc/thread.h>
-
-#include "../netmgr/netmgr-int.h"
-#include "isctest.h"
-
-#define MAX_NM 2
-
-static isc_sockaddr_t tlsdns_listen_addr;
-static isc_tlsctx_t *tlsdns_listen_ctx = NULL;
-static isc_tlsctx_t *tlsdns_connect_ctx = NULL;
-
-static uint64_t send_magic = 0;
-static uint64_t stop_magic = 0;
-
-static uv_buf_t send_msg = { .base = (char *)&send_magic,
-			     .len = sizeof(send_magic) };
-
-static uv_buf_t stop_msg = { .base = (char *)&stop_magic,
-			     .len = sizeof(stop_magic) };
-
-static atomic_uint_fast64_t nsends;
-
-static atomic_uint_fast64_t ssends;
-static atomic_uint_fast64_t sreads;
-
-static atomic_uint_fast64_t cconnects;
-static atomic_uint_fast64_t csends;
-static atomic_uint_fast64_t creads;
-static atomic_uint_fast64_t ctimeouts;
-
-static unsigned int workers = 1;
-
-static bool reuse_supported = true;
-
-#define NSENDS	100
-#define NWRITES 10
-
-#define CHECK_RANGE_FULL(v)                                       \
-	{                                                         \
-		int __v = atomic_load(&v);                        \
-		assert_true(__v > 1);                             \
-		assert_true(__v <= NSENDS * NWRITES * 110 / 100); \
-	}
-
-#define CHECK_RANGE_HALF(v)                                      \
-	{                                                        \
-		int __v = atomic_load(&v);                       \
-		assert_true(__v > 1);                            \
-		assert_true(__v <= NSENDS * NWRITES * 60 / 100); \
-	}
-
-/* Enable this to print values while running tests */
-#undef PRINT_DEBUG
-#ifdef PRINT_DEBUG
-#define X(v) fprintf(stderr, #v " = %" PRIu64 "\n", atomic_load(&v))
-#else
-#define X(v)
-#endif
-
-static int
-setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) {
-	isc_result_t result;
-	socklen_t addrlen = sizeof(*addr);
-	int fd;
-	int r;
-
-	isc_sockaddr_fromin6(addr, &in6addr_loopback, 0);
-
-	fd = socket(AF_INET6, family, 0);
-	if (fd < 0) {
-		perror("setup_ephemeral_port: socket()");
-		return (-1);
-	}
-
-	r = bind(fd, (const struct sockaddr *)&addr->type.sa,
-		 sizeof(addr->type.sin6));
-	if (r != 0) {
-		perror("setup_ephemeral_port: bind()");
-		close(fd);
-		return (r);
-	}
-
-	r = getsockname(fd, (struct sockaddr *)&addr->type.sa, &addrlen);
-	if (r != 0) {
-		perror("setup_ephemeral_port: getsockname()");
-		close(fd);
-		return (r);
-	}
-
-	result = isc__nm_socket_reuse(fd);
-	if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) {
-		fprintf(stderr,
-			"setup_ephemeral_port: isc__nm_socket_reuse(): %s",
-			isc_result_totext(result));
-		close(fd);
-		return (-1);
-	}
-
-	result = isc__nm_socket_reuse_lb(fd);
-	if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) {
-		fprintf(stderr,
-			"setup_ephemeral_port: isc__nm_socket_reuse_lb(): %s",
-			isc_result_totext(result));
-		close(fd);
-		return (-1);
-	}
-	if (result == ISC_R_NOTIMPLEMENTED) {
-		reuse_supported = false;
-	}
-
-#if IPV6_RECVERR
-#define setsockopt_on(socket, level, name) \
-	setsockopt(socket, level, name, &(int){ 1 }, sizeof(int))
-
-	r = setsockopt_on(fd, IPPROTO_IPV6, IPV6_RECVERR);
-	if (r != 0) {
-		perror("setup_ephemeral_port");
-		close(fd);
-		return (r);
-	}
-#endif
-
-	return (fd);
-}
-
-static int
-_setup(void **state) {
-	UNUSED(state);
-
-	/* workers = isc_os_ncpus(); */
-
-	if (isc_test_begin(NULL, true, workers) != ISC_R_SUCCESS) {
-		return (-1);
-	}
-
-	signal(SIGPIPE, SIG_IGN);
-
-	return (0);
-}
-
-static int
-_teardown(void **state) {
-	UNUSED(state);
-
-	isc_test_end();
-
-	return (0);
-}
-
-/* Generic */
-
-static void
-noop_recv_cb(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
-	     void *cbarg) {
-	UNUSED(handle);
-	UNUSED(eresult);
-	UNUSED(region);
-	UNUSED(cbarg);
-}
-
-static unsigned int
-noop_accept_cb(isc_nmhandle_t *handle, unsigned int result, void *cbarg) {
-	UNUSED(handle);
-	UNUSED(result);
-	UNUSED(cbarg);
-
-	return (0);
-}
-
-static void
-noop_connect_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
-	UNUSED(handle);
-	UNUSED(result);
-	UNUSED(cbarg);
-}
-
-thread_local uint8_t tlsdns_buffer_storage[4096];
-thread_local size_t tlsdns_buffer_length = 0;
-
-static int
-nm_setup(void **state) {
-	size_t nworkers = ISC_MAX(ISC_MIN(workers, 32), 1);
-	int tlsdns_listen_sock = -1;
-	isc_nm_t **nm = NULL;
-
-	if (isc_tlsctx_createserver(NULL, NULL, &tlsdns_listen_ctx) !=
-	    ISC_R_SUCCESS) {
-		return (-1);
-	}
-	if (isc_tlsctx_createclient(&tlsdns_connect_ctx) != ISC_R_SUCCESS) {
-		return (-1);
-	}
-
-	tlsdns_listen_addr = (isc_sockaddr_t){ .length = 0 };
-	tlsdns_listen_sock = setup_ephemeral_port(&tlsdns_listen_addr,
-						  SOCK_STREAM);
-	if (tlsdns_listen_sock < 0) {
-		return (-1);
-	}
-	close(tlsdns_listen_sock);
-	tlsdns_listen_sock = -1;
-
-	atomic_store(&nsends, NSENDS * NWRITES);
-
-	atomic_store(&csends, 0);
-	atomic_store(&creads, 0);
-	atomic_store(&sreads, 0);
-	atomic_store(&ssends, 0);
-	atomic_store(&ctimeouts, 0);
-	atomic_store(&cconnects, 0);
-
-	isc_nonce_buf(&send_magic, sizeof(send_magic));
-	isc_nonce_buf(&stop_magic, sizeof(stop_magic));
-	if (send_magic == stop_magic) {
-		return (-1);
-	}
-
-	nm = isc_mem_get(test_mctx, MAX_NM * sizeof(nm[0]));
-	for (size_t i = 0; i < MAX_NM; i++) {
-		nm[i] = isc_nm_start(test_mctx, nworkers);
-		assert_non_null(nm[i]);
-	}
-
-	*state = nm;
-
-	return (0);
-}
-
-static int
-nm_teardown(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-
-	for (size_t i = 0; i < MAX_NM; i++) {
-		isc_nm_destroy(&nm[i]);
-		assert_null(nm[i]);
-	}
-	isc_mem_put(test_mctx, nm, MAX_NM * sizeof(nm[0]));
-
-	isc_tlsctx_free(&tlsdns_connect_ctx);
-	isc_tlsctx_free(&tlsdns_listen_ctx);
-
-	return (0);
-}
-
-thread_local size_t nwrites = NWRITES;
-
-/* TLSDNS */
-
-static void
-tlsdns_connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		       void *cbarg);
-
-static void
-tlsdns_connect_send(isc_nmhandle_t *handle);
-
-static void
-tlsdns_connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		       void *cbarg) {
-	assert_non_null(handle);
-
-	UNUSED(cbarg);
-
-	if (eresult == ISC_R_SUCCESS) {
-		atomic_fetch_add(&csends, 1);
-	} else {
-		/* Send failed, we need to stop reading too */
-		isc_nm_cancelread(handle);
-	}
-}
-
-static void
-tlsdns_connect_send(isc_nmhandle_t *handle) {
-	uint_fast64_t sends = atomic_load(&nsends);
-
-	/* Continue until we subtract or we are sent them all */
-	while (sends > 0) {
-		if (atomic_compare_exchange_weak(&nsends, &sends, sends - 1)) {
-			sends--;
-			break;
-		}
-	}
-
-	if (sends == 0) {
-		isc_nm_send(handle, (isc_region_t *)&stop_msg,
-			    tlsdns_connect_send_cb, NULL);
-	} else {
-		isc_nm_send(handle, (isc_region_t *)&send_msg,
-			    tlsdns_connect_send_cb, NULL);
-	}
-}
-
-static void
-tlsdns_connect_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		       isc_region_t *region, void *cbarg) {
-	uint64_t magic = 0;
-
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-
-	if (eresult != ISC_R_SUCCESS) {
-		goto unref;
-	}
-
-	assert_int_equal(region->length, sizeof(magic));
-
-	atomic_fetch_add(&creads, 1);
-
-	memmove(&magic, region->base, sizeof(magic));
-
-	assert_true(magic == stop_magic || magic == send_magic);
-
-unref:
-	isc_nmhandle_detach(&handle);
-}
-
-static void
-tlsdns_connect_connect_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-			  void *cbarg) {
-	isc_nmhandle_t *readhandle = NULL;
-	UNUSED(cbarg);
-
-	if (eresult != ISC_R_SUCCESS) {
-		uint_fast64_t sends = atomic_load(&nsends);
-
-		/* We failed to connect; try again */
-		while (sends > 0) {
-			/* Continue until we subtract or we are done */
-			if (atomic_compare_exchange_weak(&nsends, &sends,
-							 sends - 1)) {
-				sends--;
-				break;
-			}
-		}
-		return;
-	}
-
-	atomic_fetch_add(&cconnects, 1);
-
-	isc_nmhandle_attach(handle, &readhandle);
-	isc_nm_read(handle, tlsdns_connect_read_cb, NULL);
-
-	tlsdns_connect_send(handle);
-}
-
-static void
-tlsdns_noop(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tlsdns_connect_addr;
-
-	tlsdns_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tlsdns_connect_addr, &in6addr_loopback, 0);
-
-	result = isc_nm_listentlsdns(
-		listen_nm, (isc_nmiface_t *)&tlsdns_listen_addr, noop_recv_cb,
-		NULL, noop_accept_cb, NULL, 0, 0, NULL, tlsdns_listen_ctx,
-		&listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	(void)isc_nm_tlsdnsconnect(
-		connect_nm, (isc_nmiface_t *)&tlsdns_connect_addr,
-		(isc_nmiface_t *)&tlsdns_listen_addr, noop_connect_cb, NULL,
-		1000, 0, tlsdns_connect_ctx);
-	isc_nm_closedown(connect_nm);
-
-	assert_int_equal(0, atomic_load(&cconnects));
-	assert_int_equal(0, atomic_load(&csends));
-	assert_int_equal(0, atomic_load(&creads));
-	assert_int_equal(0, atomic_load(&ctimeouts));
-	assert_int_equal(0, atomic_load(&sreads));
-	assert_int_equal(0, atomic_load(&ssends));
-}
-
-static void
-tlsdns_noresponse(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tlsdns_connect_addr;
-
-	tlsdns_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tlsdns_connect_addr, &in6addr_loopback, 0);
-
-	result = isc_nm_listentlsdns(
-		listen_nm, (isc_nmiface_t *)&tlsdns_listen_addr, noop_recv_cb,
-		NULL, noop_accept_cb, NULL, 0, 0, NULL, tlsdns_listen_ctx,
-		&listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	(void)isc_nm_tlsdnsconnect(
-		connect_nm, (isc_nmiface_t *)&tlsdns_connect_addr,
-		(isc_nmiface_t *)&tlsdns_listen_addr, tlsdns_connect_connect_cb,
-		NULL, 1000, 0, tlsdns_connect_ctx);
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_true(atomic_load(&cconnects) <= 1);
-	assert_true(atomic_load(&csends) <= 1);
-	assert_int_equal(0, atomic_load(&creads));
-	assert_int_equal(0, atomic_load(&ctimeouts));
-	assert_int_equal(0, atomic_load(&sreads));
-	assert_int_equal(0, atomic_load(&ssends));
-}
-
-static void
-tlsdns_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		      isc_region_t *region, void *cbarg);
-
-static void
-tlsdns_listen_send_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		      void *cbarg) {
-	UNUSED(cbarg);
-	UNUSED(eresult);
-
-	assert_non_null(handle);
-
-	if (eresult != ISC_R_SUCCESS) {
-		return;
-	}
-
-	atomic_fetch_add(&ssends, 1);
-}
-
-static void
-tlsdns_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		      isc_region_t *region, void *cbarg) {
-	uint64_t magic = 0;
-
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-
-	if (eresult != ISC_R_SUCCESS) {
-		return;
-	}
-
-	atomic_fetch_add(&sreads, 1);
-
-	assert_int_equal(region->length, sizeof(magic));
-
-	memmove(&magic, region->base, sizeof(magic));
-	assert_true(magic == stop_magic || magic == send_magic);
-
-	if (magic == send_magic) {
-		isc_nm_send(handle, region, tlsdns_listen_send_cb, NULL);
-		return;
-	} else if (magic == stop_magic) {
-		/* We are done, we don't send anything back */
-	}
-}
-
-static isc_result_t
-tlsdns_listen_accept_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-			void *cbarg) {
-	UNUSED(handle);
-	UNUSED(cbarg);
-
-	return (eresult);
-}
-
-static isc_threadresult_t
-tlsdns_connect_thread(isc_threadarg_t arg) {
-	isc_nm_t *connect_nm = (isc_nm_t *)arg;
-	isc_sockaddr_t tlsdns_connect_addr;
-
-	tlsdns_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tlsdns_connect_addr, &in6addr_loopback, 0);
-
-	while (atomic_load(&nsends) > 0) {
-		(void)isc_nm_tlsdnsconnect(
-			connect_nm, (isc_nmiface_t *)&tlsdns_connect_addr,
-			(isc_nmiface_t *)&tlsdns_listen_addr,
-			tlsdns_connect_connect_cb, NULL, 1000, 0,
-			tlsdns_connect_ctx);
-	}
-
-	return ((isc_threadresult_t)0);
-}
-
-static void
-tlsdns_recv_one(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tlsdns_connect_addr;
-
-	tlsdns_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tlsdns_connect_addr, &in6addr_loopback, 0);
-
-	atomic_store(&nsends, 1);
-
-	result = isc_nm_listentlsdns(
-		listen_nm, (isc_nmiface_t *)&tlsdns_listen_addr,
-		tlsdns_listen_read_cb, NULL, tlsdns_listen_accept_cb, NULL, 0,
-		0, NULL, tlsdns_listen_ctx, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	(void)isc_nm_tlsdnsconnect(
-		connect_nm, (isc_nmiface_t *)&tlsdns_connect_addr,
-		(isc_nmiface_t *)&tlsdns_listen_addr, tlsdns_connect_connect_cb,
-		NULL, 1000, 0, tlsdns_connect_ctx);
-
-	while (atomic_load(&nsends) > 0) {
-		isc_thread_yield();
-	}
-
-	while (atomic_load(&cconnects) != 1 || atomic_load(&ssends) != 0 ||
-	       atomic_load(&sreads) != 1 || atomic_load(&creads) != 0 ||
-	       atomic_load(&csends) != 1)
-	{
-		isc_thread_yield();
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_int_equal(atomic_load(&cconnects), 1);
-	assert_int_equal(atomic_load(&csends), 1);
-	assert_int_equal(atomic_load(&creads), 0);
-	assert_int_equal(atomic_load(&ctimeouts), 0);
-	assert_int_equal(atomic_load(&sreads), 1);
-	assert_int_equal(atomic_load(&ssends), 0);
-}
-
-static void
-tlsdns_recv_two(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t tlsdns_connect_addr;
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	tlsdns_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&tlsdns_connect_addr, &in6addr_loopback, 0);
-
-	atomic_store(&nsends, 2);
-
-	result = isc_nm_listentlsdns(
-		listen_nm, (isc_nmiface_t *)&tlsdns_listen_addr,
-		tlsdns_listen_read_cb, NULL, tlsdns_listen_accept_cb, NULL, 0,
-		0, NULL, tlsdns_listen_ctx, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	result = isc_nm_tlsdnsconnect(
-		connect_nm, (isc_nmiface_t *)&tlsdns_connect_addr,
-		(isc_nmiface_t *)&tlsdns_listen_addr, tlsdns_connect_connect_cb,
-		NULL, 1000, 0, tlsdns_connect_ctx);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	isc_nm_settimeouts(connect_nm, 1000, 1000, 1000, 1000);
-
-	result = isc_nm_tlsdnsconnect(
-		connect_nm, (isc_nmiface_t *)&tlsdns_connect_addr,
-		(isc_nmiface_t *)&tlsdns_listen_addr, tlsdns_connect_connect_cb,
-		NULL, 1000, 0, tlsdns_connect_ctx);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	while (atomic_load(&nsends) > 0) {
-		isc_thread_yield();
-	}
-
-	while (atomic_load(&sreads) != 2 || atomic_load(&ssends) != 1 ||
-	       atomic_load(&csends) != 2 || atomic_load(&creads) != 1)
-	{
-		isc_thread_yield();
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_int_equal(atomic_load(&cconnects), 2);
-	assert_int_equal(atomic_load(&csends), 2);
-	assert_int_equal(atomic_load(&creads), 1);
-	assert_int_equal(atomic_load(&ctimeouts), 0);
-	assert_int_equal(atomic_load(&sreads), 2);
-	assert_int_equal(atomic_load(&ssends), 1);
-}
-
-static void
-tlsdns_recv_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentlsdns(
-		listen_nm, (isc_nmiface_t *)&tlsdns_listen_addr,
-		tlsdns_listen_read_cb, NULL, tlsdns_listen_accept_cb, NULL, 0,
-		0, NULL, tlsdns_listen_ctx, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tlsdns_connect_thread, connect_nm,
-				  &threads[i]);
-	}
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_closedown(connect_nm);
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_FULL(csends);
-	CHECK_RANGE_FULL(creads);
-	CHECK_RANGE_FULL(sreads);
-	CHECK_RANGE_FULL(ssends);
-}
-
-#if 0
-static void
-tlsdns_recv_half_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentlsdns(
-		listen_nm, (isc_nmiface_t *)&tlsdns_listen_addr,
-		tlsdns_listen_read_cb, NULL, tlsdns_listen_accept_cb, NULL, 0,
-		0, NULL, tlsdns_listen_ctx, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tlsdns_connect_thread, connect_nm,
-				  &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_closedown(connect_nm);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_HALF(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-
-static void
-tlsdns_half_recv_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentlsdns(
-		listen_nm, (isc_nmiface_t *)&tlsdns_listen_addr,
-		tlsdns_listen_read_cb, NULL, tlsdns_listen_accept_cb, NULL, 0,
-		0, NULL, tlsdns_listen_ctx, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tlsdns_connect_thread, connect_nm,
-				  &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_HALF(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-
-static void
-tlsdns_half_recv_half_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	if (!reuse_supported) {
-		skip();
-		return;
-	}
-
-	result = isc_nm_listentlsdns(
-		listen_nm, (isc_nmiface_t *)&tlsdns_listen_addr,
-		tlsdns_listen_read_cb, NULL, tlsdns_listen_accept_cb, NULL, 0,
-		0, NULL, tlsdns_listen_ctx, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(tlsdns_connect_thread, connect_nm,
-				  &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_closedown(connect_nm);
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	CHECK_RANGE_HALF(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-#endif
-
-int
-main(void) {
-	const struct CMUnitTest tests[] = {
-		cmocka_unit_test_setup_teardown(tlsdns_recv_one, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tlsdns_recv_two, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tlsdns_noop, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tlsdns_noresponse, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tlsdns_recv_send, nm_setup,
-						nm_teardown),
-#if 0
-		cmocka_unit_test_setup_teardown(tlsdns_recv_half_send, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tlsdns_half_recv_send, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(tlsdns_half_recv_half_send,
-						nm_setup, nm_teardown),
-#endif
-	};
-
-	return (cmocka_run_group_tests(tests, _setup, _teardown));
-}
-
-#else /* HAVE_CMOCKA */
-
-#include <stdio.h>
-
-int
-main(void) {
-	printf("1..0 # Skipped: cmocka not available\n");
-	return (SKIPPED_TEST_EXIT_CODE);
-}
-
-#endif /* if HAVE_CMOCKA */
diff --git a/lib/isc/tests/udp_test.c b/lib/isc/tests/udp_test.c
deleted file mode 100644
index f78bcf9ec7..0000000000
--- a/lib/isc/tests/udp_test.c
+++ /dev/null
@@ -1,892 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#if HAVE_CMOCKA
-#include <sched.h> /* IWYU pragma: keep */
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-#include <uv.h>
-
-#define UNIT_TESTING
-#include <cmocka.h>
-
-#include <isc/atomic.h>
-#include <isc/buffer.h>
-#include <isc/condition.h>
-#include <isc/mutex.h>
-#include <isc/netmgr.h>
-#include <isc/nonce.h>
-#include <isc/os.h>
-#include <isc/refcount.h>
-#include <isc/sockaddr.h>
-#include <isc/thread.h>
-
-#include "uv_wrap.h"
-#define KEEP_BEFORE
-
-#include "../netmgr/netmgr-int.h"
-#include "../netmgr/udp.c"
-#include "../netmgr/uv-compat.c"
-#include "../netmgr/uv-compat.h"
-#include "isctest.h"
-
-#define MAX_NM 2
-
-static isc_sockaddr_t udp_listen_addr;
-
-static uint64_t send_magic = 0;
-static uint64_t stop_magic = 0;
-
-static uv_buf_t send_msg = { .base = (char *)&stop_magic,
-			     .len = sizeof(stop_magic) };
-
-static uv_buf_t stop_msg = { .base = (char *)&stop_magic,
-			     .len = sizeof(stop_magic) };
-
-static atomic_uint_fast64_t nsends;
-
-static atomic_uint_fast64_t ssends;
-static atomic_uint_fast64_t sreads;
-
-static atomic_uint_fast64_t cconnects;
-static atomic_uint_fast64_t csends;
-static atomic_uint_fast64_t creads;
-static atomic_uint_fast64_t ctimeouts;
-
-static unsigned int workers = 3;
-
-#define NSENDS	100
-#define NWRITES 10
-
-/*
- * The UDP protocol doesn't protect against packet duplication, but instead of
- * inventing de-duplication, we just ignore the upper bound.
- */
-
-#define CHECK_RANGE_FULL(v)                                             \
-	{                                                               \
-		int __v = atomic_load(&v);                              \
-		assert_true(NSENDS *NWRITES * 20 / 100 <= __v);         \
-		/* assert_true(__v <= NSENDS * NWRITES * 110 / 100); */ \
-	}
-
-#define CHECK_RANGE_HALF(v)                                            \
-	{                                                              \
-		int __v = atomic_load(&v);                             \
-		assert_true(NSENDS *NWRITES * 10 / 100 <= __v);        \
-		/* assert_true(__v <= NSENDS * NWRITES * 60 / 100); */ \
-	}
-
-/* Enable this to print values while running tests */
-#undef PRINT_DEBUG
-#ifdef PRINT_DEBUG
-#define X(v) fprintf(stderr, #v " = %" PRIu64 "\n", atomic_load(&v))
-#else
-#define X(v)
-#endif
-
-/* MOCK */
-
-static int
-setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) {
-	isc_result_t result;
-	socklen_t addrlen = sizeof(*addr);
-	int fd;
-	int r;
-
-	isc_sockaddr_fromin6(addr, &in6addr_loopback, 0);
-
-	fd = socket(AF_INET6, family, 0);
-	if (fd < 0) {
-		perror("setup_ephemeral_port: socket()");
-		return (-1);
-	}
-
-	r = bind(fd, (const struct sockaddr *)&addr->type.sa,
-		 sizeof(addr->type.sin6));
-	if (r != 0) {
-		perror("setup_ephemeral_port: bind()");
-		close(fd);
-		return (r);
-	}
-
-	r = getsockname(fd, (struct sockaddr *)&addr->type.sa, &addrlen);
-	if (r != 0) {
-		perror("setup_ephemeral_port: getsockname()");
-		close(fd);
-		return (r);
-	}
-
-	result = isc__nm_socket_reuse(fd);
-	if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) {
-		fprintf(stderr,
-			"setup_ephemeral_port: isc__nm_socket_reuse(): %s",
-			isc_result_totext(result));
-		close(fd);
-		return (-1);
-	}
-
-	result = isc__nm_socket_reuse_lb(fd);
-	if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) {
-		fprintf(stderr,
-			"setup_ephemeral_port: isc__nm_socket_reuse_lb(): %s",
-			isc_result_totext(result));
-		close(fd);
-		return (-1);
-	}
-
-#if IPV6_RECVERR
-#define setsockopt_on(socket, level, name) \
-	setsockopt(socket, level, name, &(int){ 1 }, sizeof(int))
-
-	r = setsockopt_on(fd, IPPROTO_IPV6, IPV6_RECVERR);
-	if (r != 0) {
-		perror("setup_ephemeral_port");
-		close(fd);
-		return (r);
-	}
-#endif
-
-	return (fd);
-}
-
-static int
-_setup(void **state) {
-	UNUSED(state);
-
-	/* workers = isc_os_ncpus(); */
-
-	if (isc_test_begin(NULL, true, workers) != ISC_R_SUCCESS) {
-		return (-1);
-	}
-
-	signal(SIGPIPE, SIG_IGN);
-
-	return (0);
-}
-
-static int
-_teardown(void **state) {
-	UNUSED(state);
-
-	isc_test_end();
-
-	return (0);
-}
-
-/* Generic */
-
-static void
-noop_recv_cb(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
-	     void *cbarg) {
-	UNUSED(handle);
-	UNUSED(eresult);
-	UNUSED(region);
-	UNUSED(cbarg);
-}
-
-static void
-noop_connect_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
-	UNUSED(handle);
-	UNUSED(result);
-	UNUSED(cbarg);
-}
-
-static int
-nm_setup(void **state) {
-	size_t nworkers = ISC_MAX(ISC_MIN(workers, 32), 1);
-	int udp_listen_sock = -1;
-	isc_nm_t **nm = NULL;
-
-	udp_listen_addr = (isc_sockaddr_t){ .length = 0 };
-	udp_listen_sock = setup_ephemeral_port(&udp_listen_addr, SOCK_DGRAM);
-	if (udp_listen_sock < 0) {
-		return (-1);
-	}
-	close(udp_listen_sock);
-	udp_listen_sock = -1;
-
-	atomic_store(&nsends, NSENDS * NWRITES);
-
-	atomic_store(&csends, 0);
-	atomic_store(&creads, 0);
-	atomic_store(&sreads, 0);
-	atomic_store(&ssends, 0);
-	atomic_store(&ctimeouts, 0);
-	atomic_store(&cconnects, 0);
-
-	isc_nonce_buf(&send_magic, sizeof(send_magic));
-	isc_nonce_buf(&stop_magic, sizeof(stop_magic));
-	if (send_magic == stop_magic) {
-		return (-1);
-	}
-
-	nm = isc_mem_get(test_mctx, MAX_NM * sizeof(nm[0]));
-	for (size_t i = 0; i < MAX_NM; i++) {
-		nm[i] = isc_nm_start(test_mctx, nworkers);
-		assert_non_null(nm[i]);
-	}
-
-	*state = nm;
-
-	return (0);
-}
-
-static int
-nm_teardown(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-
-	for (size_t i = 0; i < MAX_NM; i++) {
-		isc_nm_destroy(&nm[i]);
-		assert_null(nm[i]);
-	}
-	isc_mem_put(test_mctx, nm, MAX_NM * sizeof(nm[0]));
-
-	return (0);
-}
-
-thread_local size_t nwrites = NWRITES;
-
-/* UDP */
-
-static void
-udp_listen_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
-	assert_non_null(handle);
-	UNUSED(cbarg);
-
-	if (eresult == ISC_R_SUCCESS) {
-		atomic_fetch_add(&ssends, 1);
-	}
-}
-
-static void
-udp_listen_recv_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		   isc_region_t *region, void *cbarg) {
-	uint64_t magic = 0;
-
-	assert_null(cbarg);
-
-	if (eresult != ISC_R_SUCCESS) {
-		return;
-	}
-
-	assert_int_equal(region->length, sizeof(send_magic));
-	atomic_fetch_add(&sreads, 1);
-	memmove(&magic, region->base, sizeof(magic));
-
-	assert_true(magic == stop_magic || magic == send_magic);
-	isc_nm_send(handle, region, udp_listen_send_cb, NULL);
-}
-
-static void
-mock_listenudp_uv_udp_open(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t udp_connect_addr;
-
-	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_udp_open, UV_ENOMEM);
-
-	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
-				  noop_recv_cb, NULL, 0, &listen_sock);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-	assert_null(listen_sock);
-
-	RESET_RETURN;
-}
-
-static void
-mock_listenudp_uv_udp_bind(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t udp_connect_addr;
-
-	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_udp_bind, UV_EADDRINUSE);
-
-	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
-				  noop_recv_cb, NULL, 0, &listen_sock);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-	assert_null(listen_sock);
-
-	RESET_RETURN;
-}
-
-static void
-mock_listenudp_uv_udp_recv_start(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t udp_connect_addr;
-
-	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_udp_recv_start, UV_EADDRINUSE);
-
-	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
-				  noop_recv_cb, NULL, 0, &listen_sock);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-	assert_null(listen_sock);
-
-	RESET_RETURN;
-}
-
-static void
-mock_udpconnect_uv_udp_open(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_sockaddr_t udp_connect_addr;
-
-	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_udp_open, UV_ENOMEM);
-
-	result = isc_nm_udpconnect(connect_nm,
-				   (isc_nmiface_t *)&udp_connect_addr,
-				   (isc_nmiface_t *)&udp_listen_addr,
-				   noop_connect_cb, NULL, 1000, 0);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-
-	isc_nm_closedown(connect_nm);
-
-	RESET_RETURN;
-}
-
-static void
-mock_udpconnect_uv_udp_bind(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_sockaddr_t udp_connect_addr;
-
-	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_udp_bind, UV_ENOMEM);
-
-	result = isc_nm_udpconnect(connect_nm,
-				   (isc_nmiface_t *)&udp_connect_addr,
-				   (isc_nmiface_t *)&udp_listen_addr,
-				   noop_connect_cb, NULL, 1000, 0);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-
-	isc_nm_closedown(connect_nm);
-
-	RESET_RETURN;
-}
-
-#if HAVE_UV_UDP_CONNECT
-static void
-mock_udpconnect_uv_udp_connect(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_sockaddr_t udp_connect_addr;
-
-	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_udp_connect, UV_ENOMEM);
-
-	result = isc_nm_udpconnect(connect_nm,
-				   (isc_nmiface_t *)&udp_connect_addr,
-				   (isc_nmiface_t *)&udp_listen_addr,
-				   noop_connect_cb, NULL, 1000, 0);
-	assert_int_not_equal(result, ISC_R_SUCCESS);
-
-	isc_nm_closedown(connect_nm);
-
-	RESET_RETURN;
-}
-#endif
-
-static void
-mock_udpconnect_uv_recv_buffer_size(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_sockaddr_t udp_connect_addr;
-
-	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_recv_buffer_size, UV_ENOMEM);
-
-	result = isc_nm_udpconnect(connect_nm,
-				   (isc_nmiface_t *)&udp_connect_addr,
-				   (isc_nmiface_t *)&udp_listen_addr,
-				   noop_connect_cb, NULL, 1000, 0);
-	assert_int_equal(result, ISC_R_SUCCESS); /* FIXME: should fail */
-
-	isc_nm_closedown(connect_nm);
-
-	RESET_RETURN;
-}
-
-static void
-mock_udpconnect_uv_send_buffer_size(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_sockaddr_t udp_connect_addr;
-
-	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
-
-	WILL_RETURN(uv_send_buffer_size, UV_ENOMEM);
-
-	result = isc_nm_udpconnect(connect_nm,
-				   (isc_nmiface_t *)&udp_connect_addr,
-				   (isc_nmiface_t *)&udp_listen_addr,
-				   noop_connect_cb, NULL, 1000, 0);
-	assert_int_equal(result, ISC_R_SUCCESS); /* FIXME: should fail */
-
-	isc_nm_closedown(connect_nm);
-
-	RESET_RETURN;
-}
-
-static void
-udp_noop(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t udp_connect_addr;
-
-	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
-
-	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
-				  noop_recv_cb, NULL, 0, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	(void)isc_nm_udpconnect(connect_nm, (isc_nmiface_t *)&udp_connect_addr,
-				(isc_nmiface_t *)&udp_listen_addr,
-				noop_connect_cb, NULL, 1000, 0);
-
-	isc_nm_closedown(connect_nm);
-
-	assert_int_equal(0, atomic_load(&cconnects));
-	assert_int_equal(0, atomic_load(&csends));
-	assert_int_equal(0, atomic_load(&creads));
-	assert_int_equal(0, atomic_load(&ctimeouts));
-	assert_int_equal(0, atomic_load(&sreads));
-	assert_int_equal(0, atomic_load(&ssends));
-}
-
-static void
-udp_connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg);
-static void
-udp_connect_recv_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		    isc_region_t *region, void *cbarg);
-
-static void
-udp_connect_send_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
-	assert_non_null(handle);
-
-	UNUSED(eresult);
-	UNUSED(cbarg);
-
-	atomic_fetch_add(&csends, 1);
-}
-
-static void
-udp_connect_send(isc_nmhandle_t *handle, isc_region_t *region) {
-	uint_fast64_t sends = atomic_load(&nsends);
-
-	while (sends > 0) {
-		/* Continue until we subtract or we are done */
-		if (atomic_compare_exchange_weak(&nsends, &sends, sends - 1)) {
-			break;
-		}
-	}
-
-	isc_nm_send(handle, region, udp_connect_send_cb, NULL);
-}
-
-static void
-udp_connect_recv_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		    isc_region_t *region, void *cbarg) {
-	uint64_t magic = 0;
-
-	UNUSED(cbarg);
-
-	assert_non_null(handle);
-
-	if (eresult != ISC_R_SUCCESS) {
-		goto unref;
-	}
-
-	assert_int_equal(region->length, sizeof(magic));
-
-	atomic_fetch_add(&creads, 1);
-
-	memmove(&magic, region->base, sizeof(magic));
-
-	assert_true(magic == stop_magic || magic == send_magic);
-
-	if (magic == stop_magic) {
-		goto unref;
-	}
-
-	if (isc_random_uniform(NWRITES) == 0) {
-		udp_connect_send(handle, (isc_region_t *)&stop_msg);
-	} else {
-		udp_connect_send(handle, (isc_region_t *)&send_msg);
-	}
-unref:
-	isc_nmhandle_detach(&handle);
-}
-
-static void
-udp_connect_connect_cb(isc_nmhandle_t *handle, isc_result_t eresult,
-		       void *cbarg) {
-	isc_nmhandle_t *readhandle = NULL;
-
-	UNUSED(cbarg);
-
-	if (eresult != ISC_R_SUCCESS) {
-		uint_fast64_t sends = atomic_load(&nsends);
-
-		/* We failed to connect; try again */
-		while (sends > 0) {
-			/* Continue until we subtract or we are done */
-			if (atomic_compare_exchange_weak(&nsends, &sends,
-							 sends - 1)) {
-				break;
-			}
-		}
-		return;
-	}
-
-	atomic_fetch_add(&cconnects, 1);
-
-	isc_nmhandle_attach(handle, &readhandle);
-	isc_nm_read(handle, udp_connect_recv_cb, NULL);
-
-	udp_connect_send(handle, (isc_region_t *)&send_msg);
-}
-
-static isc_threadresult_t
-udp_connect_thread(isc_threadarg_t arg) {
-	isc_nm_t *connect_nm = (isc_nm_t *)arg;
-	isc_sockaddr_t udp_connect_addr;
-
-	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
-
-	while (atomic_load(&nsends) > 0) {
-		(void)isc_nm_udpconnect(connect_nm,
-					(isc_nmiface_t *)&udp_connect_addr,
-					(isc_nmiface_t *)&udp_listen_addr,
-					udp_connect_connect_cb, NULL, 1000, 0);
-	}
-	return ((isc_threadresult_t)0);
-}
-
-static void
-udp_noresponse(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	isc_sockaddr_t udp_connect_addr;
-
-	udp_connect_addr = (isc_sockaddr_t){ .length = 0 };
-	isc_sockaddr_fromin6(&udp_connect_addr, &in6addr_loopback, 0);
-
-	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
-				  noop_recv_cb, NULL, 0, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	(void)isc_nm_udpconnect(connect_nm, (isc_nmiface_t *)&udp_connect_addr,
-				(isc_nmiface_t *)&udp_listen_addr,
-				udp_connect_connect_cb, NULL, 1000, 0);
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-	isc_nm_closedown(connect_nm);
-
-	while (atomic_load(&cconnects) != 1) {
-		isc_thread_yield();
-	}
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_int_equal(1, atomic_load(&cconnects));
-	assert_true(atomic_load(&csends) <= 1);
-	assert_int_equal(0, atomic_load(&creads));
-	assert_int_equal(0, atomic_load(&ctimeouts));
-	assert_int_equal(0, atomic_load(&sreads));
-	assert_int_equal(0, atomic_load(&ssends));
-}
-
-static void
-udp_recv_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
-				  udp_listen_recv_cb, NULL, 0, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(udp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_true(atomic_load(&cconnects) >= (NSENDS - 1) * NWRITES);
-	CHECK_RANGE_FULL(csends);
-	CHECK_RANGE_FULL(creads);
-	CHECK_RANGE_FULL(sreads);
-	CHECK_RANGE_FULL(ssends);
-}
-
-static void
-udp_recv_half_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
-				  udp_listen_recv_cb, NULL, 0, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(udp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_closedown(connect_nm);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_true(atomic_load(&cconnects) >= (NSENDS - 1) * NWRITES);
-	CHECK_RANGE_FULL(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-
-static void
-udp_half_recv_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
-				  udp_listen_recv_cb, NULL, 0, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(udp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	isc_nm_closedown(connect_nm);
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_true(atomic_load(&cconnects) >= (NSENDS - 1) * NWRITES);
-	CHECK_RANGE_FULL(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-
-static void
-udp_half_recv_half_send(void **state) {
-	isc_nm_t **nm = (isc_nm_t **)*state;
-	isc_nm_t *listen_nm = nm[0];
-	isc_nm_t *connect_nm = nm[1];
-	isc_result_t result = ISC_R_SUCCESS;
-	isc_nmsocket_t *listen_sock = NULL;
-	size_t nthreads = ISC_MAX(ISC_MIN(workers, 32), 1);
-	isc_thread_t threads[32] = { 0 };
-
-	result = isc_nm_listenudp(listen_nm, (isc_nmiface_t *)&udp_listen_addr,
-				  udp_listen_recv_cb, NULL, 0, &listen_sock);
-	assert_int_equal(result, ISC_R_SUCCESS);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_create(udp_connect_thread, connect_nm, &threads[i]);
-	}
-
-	while (atomic_load(&nsends) >= (NSENDS * NWRITES) / 2) {
-		isc_thread_yield();
-	}
-
-	isc_nm_closedown(connect_nm);
-	isc_nm_stoplistening(listen_sock);
-	isc_nmsocket_close(&listen_sock);
-	assert_null(listen_sock);
-
-	for (size_t i = 0; i < nthreads; i++) {
-		isc_thread_join(threads[i], NULL);
-	}
-
-	X(cconnects);
-	X(csends);
-	X(creads);
-	X(ctimeouts);
-	X(sreads);
-	X(ssends);
-
-	assert_true(atomic_load(&cconnects) >= (NSENDS - 1) * NWRITES);
-	CHECK_RANGE_FULL(csends);
-	CHECK_RANGE_HALF(creads);
-	CHECK_RANGE_HALF(sreads);
-	CHECK_RANGE_HALF(ssends);
-}
-
-int
-main(void) {
-	const struct CMUnitTest tests[] = {
-		cmocka_unit_test_setup_teardown(mock_listenudp_uv_udp_open,
-						nm_setup, nm_teardown),
-		cmocka_unit_test_setup_teardown(mock_listenudp_uv_udp_bind,
-						nm_setup, nm_teardown),
-		cmocka_unit_test_setup_teardown(
-			mock_listenudp_uv_udp_recv_start, nm_setup,
-			nm_teardown),
-		cmocka_unit_test_setup_teardown(mock_udpconnect_uv_udp_open,
-						nm_setup, nm_teardown),
-		cmocka_unit_test_setup_teardown(mock_udpconnect_uv_udp_bind,
-						nm_setup, nm_teardown),
-#if HAVE_UV_UDP_CONNECT
-		cmocka_unit_test_setup_teardown(mock_udpconnect_uv_udp_connect,
-						nm_setup, nm_teardown),
-#endif
-		cmocka_unit_test_setup_teardown(
-			mock_udpconnect_uv_recv_buffer_size, nm_setup,
-			nm_teardown),
-		cmocka_unit_test_setup_teardown(
-			mock_udpconnect_uv_send_buffer_size, nm_setup,
-			nm_teardown),
-		cmocka_unit_test_setup_teardown(udp_noop, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(udp_noresponse, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(udp_recv_send, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(udp_recv_half_send, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(udp_half_recv_send, nm_setup,
-						nm_teardown),
-		cmocka_unit_test_setup_teardown(udp_half_recv_half_send,
-						nm_setup, nm_teardown),
-	};
-
-	return (cmocka_run_group_tests(tests, _setup, _teardown));
-}
-
-#else /* HAVE_CMOCKA */
-
-#include <stdio.h>
-
-int
-main(void) {
-	printf("1..0 # Skipped: cmocka not available\n");
-	return (SKIPPED_TEST_EXIT_CODE);
-}
-
-#endif /* if HAVE_CMOCKA */
diff --git a/util/copyrights b/util/copyrights
index 439c141f01..b129b212dc 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1989,6 +1989,7 @@
 ./lib/isc/tests/md_test.c			C	2018,2019,2020,2021
 ./lib/isc/tests/mem_test.c			C	2015,2016,2017,2018,2019,2020,2021
 ./lib/isc/tests/netaddr_test.c			C	2016,2018,2019,2020,2021
+./lib/isc/tests/netmgr_test.c			C	2021
 ./lib/isc/tests/parse_test.c			C	2012,2013,2016,2018,2019,2020,2021
 ./lib/isc/tests/pool_test.c			C	2013,2016,2018,2019,2020,2021
 ./lib/isc/tests/quota_test.c			C	2020,2021
@@ -2003,14 +2004,9 @@
 ./lib/isc/tests/symtab_test.c			C	2011,2012,2013,2016,2018,2019,2020,2021
 ./lib/isc/tests/task_test.c			C	2011,2012,2016,2017,2018,2019,2020,2021
 ./lib/isc/tests/taskpool_test.c			C	2011,2012,2016,2018,2019,2020,2021
-./lib/isc/tests/tcp_quota_test.c		C	2020,2021
-./lib/isc/tests/tcp_test.c			C	2020,2021
-./lib/isc/tests/tcpdns_test.c			C	2020,2021
 ./lib/isc/tests/testdata/file/keep		X	2014,2018,2019,2020,2021
 ./lib/isc/tests/time_test.c			C	2014,2015,2016,2018,2019,2020,2021
 ./lib/isc/tests/timer_test.c			C	2018,2019,2020,2021
-./lib/isc/tests/tlsdns_test.c			C	2021
-./lib/isc/tests/udp_test.c			C	2020,2021
 ./lib/isc/tests/uv_wrap.h			C	2020,2021
 ./lib/isc/timer.c				C	1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021
 ./lib/isc/tls.c					C	2021