diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e39245c3..fef47c2b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,17 +19,17 @@ jobs:
         include:
           - flavor: debian
             buildsystem: Autotools
-            tests: unit+func
+            tests: unit
             omemo: signal
             script: ./ci/ci-build.sh
           - flavor: fedora
             buildsystem: Autotools
-            tests: unit+func
+            tests: unit
             omemo: signal
             script: ./ci/ci-build.sh
           - flavor: ubuntu
             buildsystem: Autotools
-            tests: unit+func
+            tests: unit
             omemo: signal
             script: ./ci/ci-build.sh
           - flavor: debian
diff --git a/ci/Dockerfile.arch b/ci/Dockerfile.arch
index a2d71bb5..6f11acf0 100644
--- a/ci/Dockerfile.arch
+++ b/ci/Dockerfile.arch
@@ -17,7 +17,6 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
   gpgme \
   gtk2 \
   libgcrypt \
-  libmicrohttpd \
   libnotify \
   libsignal-protocol-c \
   libomemo-c \
@@ -34,7 +33,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
   gdk-pixbuf2 \
   qrencode
 
-RUN mkdir -p /usr/src/{stabber,profanity}
+RUN mkdir -p /usr/src/profanity
 
 RUN useradd -mb /usr/src --shell=/bin/false aur && usermod -L aur
 USER aur
@@ -54,14 +53,5 @@ USER root
 
 RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst
 
-WORKDIR /usr/src
-#RUN git clone https://github.com/boothj5/stabber
-
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
-
 WORKDIR /usr/src/profanity
 COPY . /usr/src/profanity
diff --git a/ci/Dockerfile.debian b/ci/Dockerfile.debian
index 2f800965..d17b5eab 100644
--- a/ci/Dockerfile.debian
+++ b/ci/Dockerfile.debian
@@ -39,14 +39,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src
 
-#RUN git clone https://github.com/boothj5/stabber
+RUN git clone -c http.sslverify=false https://github.com/profanity-im/stabber
 RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
+WORKDIR /usr/src/stabber
+RUN ./bootstrap.sh
+RUN ./configure --prefix=/usr --disable-dependency-tracking
+RUN make
+RUN make install
 
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
diff --git a/ci/Dockerfile.fedora b/ci/Dockerfile.fedora
index a369a35d..3f3ee09b 100644
--- a/ci/Dockerfile.fedora
+++ b/ci/Dockerfile.fedora
@@ -1,15 +1,12 @@
 # Build the latest Fedora image
 FROM fedora:latest
 
-# expect - for functional tests
-# libmicrohttpd - for stabber
 # glibc-locale - to have en_US locale
 RUN dnf install -y \
   autoconf \
   autoconf-archive \
   automake \
   awk \
-  expect-devel \
   gcc \
   git \
   glib2-devel \
@@ -21,7 +18,6 @@ RUN dnf install -y \
   expat-devel \
   libgcrypt-devel \
   gpgme-devel \
-  libmicrohttpd-devel \
   libnotify-devel \
   libotr-devel \
   libsignal-protocol-c-devel \
@@ -47,15 +43,6 @@ ENV LC_ALL en_US.UTF-8
 RUN mkdir -p /usr/src
 WORKDIR /usr/src
 
-#RUN mkdir -p /usr/src/stabber
-#RUN git clone https://github.com/boothj5/stabber
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
-
-WORKDIR /usr/src
 RUN mkdir -p /usr/src/libstrophe
 RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 WORKDIR /usr/src/libstrophe
diff --git a/ci/Dockerfile.tumbleweed b/ci/Dockerfile.tumbleweed
index 516c9722..f4864552 100644
--- a/ci/Dockerfile.tumbleweed
+++ b/ci/Dockerfile.tumbleweed
@@ -1,14 +1,11 @@
 # Build the latest openSUSE Tumbleweed image
 FROM opensuse/tumbleweed
 
-# expect - for functional tests
-# libmicrohttpd - for stabber
 # glibc-locale - to have en_US locale
 RUN zypper --non-interactive in --no-recommends \
   autoconf \
   autoconf-archive \
   automake \
-  expect-devel \
   gcc \
   git \
   glib2-devel \
@@ -21,7 +18,6 @@ RUN zypper --non-interactive in --no-recommends \
   libgcrypt-devel \
   libgpgme-devel \
   libstrophe-devel \
-  libmicrohttpd-devel \
   libnotify-devel \
   libotr-devel \
   libsignal-protocol-c-devel \
@@ -46,14 +42,6 @@ ENV LC_ALL en_US.UTF-8
 RUN mkdir -p /usr/src
 WORKDIR /usr/src
 
-#RUN mkdir -p /usr/src/stabber
-#RUN git clone git://github.com/boothj5/stabber.git
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
-
 RUN mkdir -p /usr/src/profanity
 WORKDIR /usr/src/profanity
 COPY . /usr/src/profanity
diff --git a/ci/Dockerfile.ubuntu b/ci/Dockerfile.ubuntu
index d5ec731f..2ee5a86e 100644
--- a/ci/Dockerfile.ubuntu
+++ b/ci/Dockerfile.ubuntu
@@ -6,7 +6,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   autoconf \
   autoconf-archive \
   automake \
-  expect \
   gcc \
   git \
   libcmocka-dev \
@@ -15,7 +14,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libglib2.0-dev \
   libgpgme11-dev \
   libgtk2.0-dev \
-  libmicrohttpd-dev \
   libncursesw5-dev \
   libnotify-dev \
   libotr5-dev \
@@ -34,19 +32,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libgdk-pixbuf-2.0-dev \
   libqrencode-dev
 
-RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
+RUN mkdir -p /usr/src/{libstrophe,profanity}
 WORKDIR /usr/src
 
-#RUN git clone https://github.com/boothj5/stabber
 RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 
-# TODO: Re-enable once libmicrohttpd-dev has been updated.
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
-
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
diff --git a/ci/ci-build.sh b/ci/ci-build.sh
index 82ff76ff..662201ea 100755
--- a/ci/ci-build.sh
+++ b/ci/ci-build.sh
@@ -121,18 +121,14 @@ esac
 case "$ARCH" in
     linux*)
          echo
-         echo "--> Building with ./configure ${tests[0]} --enable-valgrind $*"
+         echo "--> Building with ./configure ${tests[0]} --enable-valgrind --disable-functional-tests $*"
          echo
 
          # shellcheck disable=SC2086
-        ./configure ${tests[0]} --enable-valgrind $*
+        ./configure ${tests[0]} --enable-valgrind --disable-functional-tests $*
 
         $MAKE CC="${CC}"
-        if grep '^ID=' /etc/os-release | grep -q -e debian; then
-            $MAKE check-valgrind
-        else
-            $MAKE check-valgrind || log_content ./test-suite-memcheck.log
-        fi
+        $MAKE check-valgrind
         $MAKE distclean
         ;;
 esac
@@ -140,14 +136,14 @@ esac
 for features in "${tests[@]}"
 do
     echo
-    echo "--> Building with ./configure ${features} $*"
+    echo "--> Building with ./configure ${features} --disable-functional-tests $*"
     echo
 
     # shellcheck disable=SC2086
-    ./configure $features $*
+    ./configure $features --disable-functional-tests $*
 
     $MAKE CC="${CC}"
-    $MAKE check
+    $MAKE check-unit
 
     ./profanity -v
     $MAKE clean