diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index 7444467ee..d88b40bbe 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -15,21 +15,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             BUILD_TYPE: default
             DRAFT: enabled
-            CLANG_FORMAT: clang-format-11
-            PACKAGES: automake autoconf clang-format-11 git libzmq3-dev libczmq-dev asciidoc xmlto
-          - os: ubuntu-20.04
+            CLANG_FORMAT: clang-format-18
+            PACKAGES: automake autoconf clang-format-18 git libzmq3-dev libczmq-dev asciidoc xmlto
+          - os: ubuntu-24.04
             BUILD_TYPE: default
             DRAFT: disabled
-            CLANG_FORMAT: clang-format-11
-            PACKAGES: automake autoconf clang-format-11 git libzmq3-dev libczmq-dev
-          - os: ubuntu-20.04
+            CLANG_FORMAT: clang-format-18
+            PACKAGES: automake autoconf clang-format-18 git libzmq3-dev libczmq-dev
+          - os: ubuntu-24.04
             BUILD_TYPE: valgrind
             DRAFT: enabled
             PACKAGES: automake autoconf valgrind git libzmq3-dev libczmq-dev
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             BUILD_TYPE: cmake
             DRAFT: enabled
             PACKAGES: cmake git libzmq3-dev libczmq-dev
@@ -45,11 +45,11 @@ jobs:
 # to have dependencies ready and pass configure script before making this check).
 # Note that the autotools variant will also require dependencies preinstalled to
 # pass its configure script:
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             BUILD_TYPE: cmake
             DO_CLANG_FORMAT_CHECK: 1
-            CLANG_FORMAT: clang-format-11
-            PACKAGES: cmake clang-format-11 git libzmq3-dev libczmq-dev
+            CLANG_FORMAT: clang-format-18
+            PACKAGES: cmake clang-format-18 git libzmq3-dev libczmq-dev
     env:
 # Set CI_TIME: true to enable build-step profiling
 # Set CI_TRACE: true to enable shell script tracing
@@ -72,12 +72,12 @@ jobs:
       CI_SELFTEST: ${{ matrix.CI_SELFTEST }}
     steps:
     - name: Add debian packages
-      if: matrix.os == 'ubuntu-20.04'
+      if: matrix.os == 'ubuntu-24.04'
       uses: myci-actions/add-deb-repo@10
       with:
         repo-name: obs
-        repo: deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/ ./
-        keys-asc: https://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/Release.key
+        repo: deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_24.04/ ./
+        keys-asc: https://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_24.04/Release.key
         install: ${{ matrix.PACKAGES }}
     - name: Add brew packages
       if: matrix.os == 'macos-latest'
@@ -87,7 +87,7 @@ jobs:
       with:
         path: zyre
     - name: build
-      if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-latest'
+      if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-latest'
       shell: bash
       working-directory: zyre
       run: ./ci_build.sh
diff --git a/configure.ac b/configure.ac
index 4d64eeb94..1fb226ec2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -536,9 +536,6 @@ AC_ARG_ENABLE([perf_local],
 AM_CONDITIONAL([ENABLE_PERF_LOCAL], [test x$enable_perf_local != xno])
 AM_COND_IF([ENABLE_PERF_LOCAL], [AC_MSG_NOTICE([ENABLE_PERF_LOCAL defined])])
 
-AM_CONDITIONAL([ENABLE_ZYRE_SELFTEST], [test x$enable_zyre_selftest != xno])
-AM_COND_IF([ENABLE_ZYRE_SELFTEST], [AC_MSG_NOTICE([ENABLE_ZYRE_SELFTEST defined])])
-
 # Check for perf_remote intent
 AC_ARG_ENABLE([perf_remote],
     AS_HELP_STRING([--enable-perf_remote],
@@ -549,9 +546,6 @@ AC_ARG_ENABLE([perf_remote],
 AM_CONDITIONAL([ENABLE_PERF_REMOTE], [test x$enable_perf_remote != xno])
 AM_COND_IF([ENABLE_PERF_REMOTE], [AC_MSG_NOTICE([ENABLE_PERF_REMOTE defined])])
 
-AM_CONDITIONAL([ENABLE_ZYRE_SELFTEST], [test x$enable_zyre_selftest != xno])
-AM_COND_IF([ENABLE_ZYRE_SELFTEST], [AC_MSG_NOTICE([ENABLE_ZYRE_SELFTEST defined])])
-
 # Check for zpinger intent
 AC_ARG_ENABLE([zpinger],
     AS_HELP_STRING([--enable-zpinger],
@@ -562,9 +556,6 @@ AC_ARG_ENABLE([zpinger],
 AM_CONDITIONAL([ENABLE_ZPINGER], [test x$enable_zpinger != xno])
 AM_COND_IF([ENABLE_ZPINGER], [AC_MSG_NOTICE([ENABLE_ZPINGER defined])])
 
-AM_CONDITIONAL([ENABLE_ZYRE_SELFTEST], [test x$enable_zyre_selftest != xno])
-AM_COND_IF([ENABLE_ZYRE_SELFTEST], [AC_MSG_NOTICE([ENABLE_ZYRE_SELFTEST defined])])
-
 # Check for ztester_beacon intent
 AC_ARG_ENABLE([ztester_beacon],
     AS_HELP_STRING([--enable-ztester_beacon],
@@ -575,9 +566,6 @@ AC_ARG_ENABLE([ztester_beacon],
 AM_CONDITIONAL([ENABLE_ZTESTER_BEACON], [test x$enable_ztester_beacon != xno])
 AM_COND_IF([ENABLE_ZTESTER_BEACON], [AC_MSG_NOTICE([ENABLE_ZTESTER_BEACON defined])])
 
-AM_CONDITIONAL([ENABLE_ZYRE_SELFTEST], [test x$enable_zyre_selftest != xno])
-AM_COND_IF([ENABLE_ZYRE_SELFTEST], [AC_MSG_NOTICE([ENABLE_ZYRE_SELFTEST defined])])
-
 # Check for ztester_gossip intent
 AC_ARG_ENABLE([ztester_gossip],
     AS_HELP_STRING([--enable-ztester_gossip],
@@ -588,9 +576,6 @@ AC_ARG_ENABLE([ztester_gossip],
 AM_CONDITIONAL([ENABLE_ZTESTER_GOSSIP], [test x$enable_ztester_gossip != xno])
 AM_COND_IF([ENABLE_ZTESTER_GOSSIP], [AC_MSG_NOTICE([ENABLE_ZTESTER_GOSSIP defined])])
 
-AM_CONDITIONAL([ENABLE_ZYRE_SELFTEST], [test x$enable_zyre_selftest != xno])
-AM_COND_IF([ENABLE_ZYRE_SELFTEST], [AC_MSG_NOTICE([ENABLE_ZYRE_SELFTEST defined])])
-
 # Check for zyre_selftest intent
 AC_ARG_ENABLE([zyre_selftest],
     AS_HELP_STRING([--enable-zyre_selftest],
@@ -601,9 +586,6 @@ AC_ARG_ENABLE([zyre_selftest],
 AM_CONDITIONAL([ENABLE_ZYRE_SELFTEST], [test x$enable_zyre_selftest != xno])
 AM_COND_IF([ENABLE_ZYRE_SELFTEST], [AC_MSG_NOTICE([ENABLE_ZYRE_SELFTEST defined])])
 
-AM_CONDITIONAL([ENABLE_ZYRE_SELFTEST], [test x$enable_zyre_selftest != xno])
-AM_COND_IF([ENABLE_ZYRE_SELFTEST], [AC_MSG_NOTICE([ENABLE_ZYRE_SELFTEST defined])])
-
 # Checks for library functions.
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(perror gettimeofday memset getifaddrs)