diff --git a/tests/Makefile.am b/tests/Makefile.am
index 91c03c54..d2111f05 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -39,6 +39,7 @@ check_PROGRAMS = \
     test_attachment \
     test_media_index \
     test_etcp_lifecycle \
+    test_etcp_server_lifecycle \
     test_reality_bgp \
     test_tcp_proxy_client \
     test_etcp_session \
@@ -801,6 +802,10 @@ check-load:
 test_etcp_lifecycle_SOURCES = test_etcp_lifecycle.c
 test_etcp_lifecycle_LDADD = $(LIBUTUN) $(CRYPTO_LIBS) $(COMMON_LIBS)
 
+test_etcp_server_lifecycle_SOURCES = test_etcp_server_lifecycle.c $(test_clock_sources)
+test_etcp_server_lifecycle_LDADD = $(LIBUTUN) $(COMMON_LIBS)
+test_etcp_server_lifecycle_LDFLAGS = $(test_clock_ldflags)
+
 test_topo_recovery_SOURCES = test_topo_recovery.c
 test_topo_recovery_LDADD = $(LIBUTUN) $(CRYPTO_LIBS) $(COMMON_LIBS)
 
diff --git a/tests/test_etcp_session.c b/tests/test_etcp_session.c
index 3511eea8..e295e1ee 100644
--- a/tests/test_etcp_session.c
+++ b/tests/test_etcp_session.c
@@ -169,6 +169,9 @@ static void setup(int multi) {
 }
 static void teardown(void) {
     for (int i=0;i<2;i++) {
+        for (int j=0;j<2;j++) {
+            if (ep[i].links[j].rx_timeout_timer) uasync_cancel_timeout(ua, ep[i].links[j].rx_timeout_timer);
+        }
         ep[i].c->links=NULL; // fixture owns synthetic authenticated links
         etcp_connection_close(ep[i].c);
     }
diff --git a/tests/test_standby_transport.c b/tests/test_standby_transport.c
index cde03378..22626b0a 100644
--- a/tests/test_standby_transport.c
+++ b/tests/test_standby_transport.c
@@ -104,6 +104,7 @@ static void teardown(void) {
     standby_deinit();
     for (int i = 0; i < 3; i++) {
         if (links[i].keepalive_timer) uasync_cancel_timeout(ua, links[i].keepalive_timer);
+        if (links[i].rx_timeout_timer) uasync_cancel_timeout(ua, links[i].rx_timeout_timer);
         if (links[i].ka_sleep_announce_timer) uasync_cancel_timeout(ua, links[i].ka_sleep_announce_timer);
     }
     while (inst.activity_cbks) utun_remove_activity_cbk(&inst, inst.activity_cbks->fn, inst.activity_cbks->arg);