diff --git a/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch b/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
deleted file mode 100644
index 329baac253..0000000000
--- a/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Wed, 10 Nov 2021 21:11:55 -0300
-Subject: [PATCH] debuginfod: fix compilation on platforms without <error.h>
-
-"system.h" only declares the error() function, so it needs to be in an
-'extern "C"' block, otherwise linking fails.
-
-Since we are here, use quotes for "system.h" header, since it's a local
-header, not a system one.
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- debuginfod/debuginfod.cxx | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
-index 521cb529..764e7b94 100644
---- a/debuginfod/debuginfod.cxx
-+++ b/debuginfod/debuginfod.cxx
-@@ -33,11 +33,11 @@
- 
- extern "C" {
- #include "printversion.h"
-+#include "system.h"
- }
- 
- #include "debuginfod.h"
- #include <dwarf.h>
--#include <system.h>
- 
- #include <argp.h>
- #ifdef __GNUC__
--- 
-2.33.1
-
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 5d37eb20ee..1fe41abe92 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,6 +1,6 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.186
+version=0.187
 revision=1
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
@@ -8,13 +8,13 @@ hostmakedepends="automake libtool pkg-config"
 _devel_depends="bzip2-devel liblzma-devel zlib-devel libzstd-devel"
 makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel
  libmicrohttpd-devel"
-checkdepends="zstd bzip2 curl rpm cpio"
+checkdepends="zstd bzip2 curl rpm cpio iproute2 procps-ng"
 short_desc="Utilities to handle ELF object files"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
-checksum=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177
+checksum=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8
 # subpackages require explicit ordering
 subpackages="debuginfod libdebuginfod libelf elfutils-devel"
 
@@ -31,8 +31,15 @@ fi
 
 do_check() {
 	# test failures also expected if building with debug disabled
-	make check ${makejobs} ||
-		msg_warn "Failure in testsuite, expected on musl systems, at least\n"
+	make check ${makejobs} || {
+		if [ "$XBPS_TARGET_LIBC" = musl ]; then
+			msg_warn "Expected testsuite failure: using musl\n"
+		elif [ -z "$XBPS_DEBUG_PKGS" ]; then
+			msg_warn "Expected testsuite failure: debug is disabled\n"
+		else
+			msg_error "Testsuite failure\n"
+		fi
+	}
 }
 
 libdebuginfod_package() {