diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index e675491910..47d425fc28 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,12 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.1.5
-revision=2
+revision=3
 build_style=gnu-makefile
-make_build_args="TARGET=linux-glibc USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1
- USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1"
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 makedepends="libatomic-devel libressl-devel lua-devel pcre-devel"
+checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -19,21 +18,20 @@ make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
 conf_files="/etc/${pkgname}/${pkgname}.cfg"
 system_accounts="$pkgname"
 
-case "$XBPS_TARGET_LIBC" in
-	musl)
-		makedepends+=" libexecinfo-devel"
-		CFLAGS="-D__LINUX_NETFILTER_H"
-		ADDLIB+=" -lexecinfo"
-	;;
-esac
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	ADDLIB+=" -latomic"
-fi
-
 do_build() {
+	local TARGET
+	case "$XBPS_TARGET_LIBC" in
+	musl)	TARGET=linux-musl ;;
+	*)	TARGET=linux-glibc ;;
+	esac
 	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
-		ADDLIB="${ADDLIB}" ${make_build_args}
+		TARGET=$TARGET USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
+		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1
+}
+
+do_check() {
+	export VTEST_PROGRAM=/usr/bin/varnishtest
+	make reg-tests || : 4 test failed on musl
 }
 
 post_install() {