diff --git a/.github/workflows/build-variants.yml b/.github/workflows/build-variants.yml
new file mode 100644
index 00000000..96a437ca
--- /dev/null
+++ b/.github/workflows/build-variants.yml
@@ -0,0 +1,39 @@
+name: Mosquitto - Build variants
+
+on:
+  push:
+    branches:
+      - develop
+      - fixes
+  pull_request:
+    branches:
+      - develop
+      - fixes
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Install third party dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y \
+          docbook-xsl \
+          libargon2-dev \
+          libc-ares-dev \
+          libcjson-dev \
+          libcunit1-dev \
+          libedit-dev \
+          libgmock-dev \
+          libssl-dev \
+          libsystemd-dev \
+          libwrap0-dev \
+          python3-all \
+          uthash-dev \
+          xsltproc
+    - uses: actions/checkout@v4
+      with:
+        submodules: 'true'
+    - name: build
+      run: ./buildtest.py
diff --git a/buildtest.py b/buildtest.py
index eb0b3933..05c0c370 100755
--- a/buildtest.py
+++ b/buildtest.py
@@ -1,18 +1,20 @@
 #!/usr/bin/python3
 
 build_variants = [
-    'WITH_ADNS',
     'WITH_ARGON2',
+    'WITH_ASAN',
     'WITH_BRIDGE',
-    'WITH_DOCS',
+    'WITH_CONTROL',
+    'WITH_EDITLINE',
     'WITH_EPOLL',
     'WITH_MEMORY_TRACKING',
+    'WITH_OLD_KEEPALIVE',
     'WITH_PERSISTENCE',
     'WITH_SHARED_LIBRARIES',
     'WITH_SOCKS',
+    'WITH_SQLITE',
     'WITH_SRV',
     'WITH_STATIC_LIBRARIES',
-    'WITH_STRIP',
     'WITH_SYSTEMD',
     'WITH_SYS_TREE',
     'WITH_THREADING',
@@ -20,7 +22,6 @@ build_variants = [
     'WITH_TLS_PSK',
     'WITH_UNIX_SOCKETS',
     'WITH_WEBSOCKETS',
-    'WITH_WRAP',
     'WITH_XTREPORT',
 ]
 
@@ -37,7 +38,7 @@ import subprocess
 def run_test(msg, opts):
     subprocess.run(["make", "clean"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     print("%s: %s" % (msg, str(opts)))
-    args = ["make", "-j%d" % (os.cpu_count())] + opts
+    args = ["make", "test-compile" "-j%d" % (os.cpu_count())] + opts
     proc = subprocess.run(args, stdout=subprocess.DEVNULL)
     if proc.returncode != 0:
         raise RuntimeError("BUILD FAILED: %s" % (' '.join(args)))