diff --git a/package/libqb/0001-Add-disable-tests-option.patch b/package/libqb/0001-Add-disable-tests-option.patch
new file mode 100644
index 0000000000..1afb05520d
--- /dev/null
+++ b/package/libqb/0001-Add-disable-tests-option.patch
@@ -0,0 +1,62 @@
+From 051d9cfe8f365e30affc6476ed79b9e04a6b15ad Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 4 Nov 2022 00:27:50 +0100
+Subject: [PATCH] Add --disable-tests option
+
+Add --disable-tests to allow the user to disable tests. As a
+side-effect, this will avoid the following build failure when check is
+found:
+
+libstat_wrapper.c:11:10: fatal error: gnu/lib-names.h: No such file or directory
+   11 | #include <gnu/lib-names.h>
+      |          ^~~~~~~~~~~~~~~~~
+
+This build failure is raised since version 2.0.5 and
+https://github.com/ClusterLabs/libqb/commit/78df90b180740712d0c90b6d982b78241cc99d72
+
+Fixes:
+ - http://autobuild.buildroot.org/results/450cfc36d4fd6dc71c138bec45f05b5a2d92a08d
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/ClusterLabs/libqb/pull/475]
+---
+ Makefile.am  | 6 +++++-
+ configure.ac | 5 +++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a08b1d2..6a710a0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -39,7 +39,11 @@ ACLOCAL_AMFLAGS		= -I m4
+ 
+ dist_doc_DATA		= COPYING INSTALL README.markdown
+ 
+-SUBDIRS			= include lib doxygen2man docs tools tests examples
++SUBDIRS			= include lib doxygen2man docs tools examples
++
++if ENABLE_TESTS
++SUBDIRS			+= tests
++endif
+ 
+ dist-clean-local:
+ 	rm -f .snapshot-version autoconf automake autoheader
+diff --git a/configure.ac b/configure.ac
+index ac44b7e..4946008 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -562,6 +562,11 @@ AC_ARG_WITH([force-sockets-config-file],
+ 	[ FORCESOCKETSFILE="$withval" ],
+ 	[ FORCESOCKETSFILE="$sysconfdir/libqb/force-filesystem-sockets" ])
+ 
++AC_ARG_ENABLE([tests],
++  [AS_HELP_STRING([--disable-tests],[disable tests])],,
++  [ enable_tests="yes" ])
++AM_CONDITIONAL([ENABLE_TESTS], [test x$enable_tests = xyes])
++
+ AC_ARG_ENABLE([install-tests],
+   [AS_HELP_STRING([--enable-install-tests],[install tests])],,
+   [ enable_install_tests="no" ])
+-- 
+2.35.1
+
diff --git a/package/libqb/libqb.mk b/package/libqb/libqb.mk
index 0f409fd646..65d68181ee 100644
--- a/package/libqb/libqb.mk
+++ b/package/libqb/libqb.mk
@@ -12,6 +12,9 @@ LIBQB_LICENSE = LGPL-2.1+
 LIBQB_LICENSE_FILES = COPYING
 LIBQB_CPE_ID_VENDOR = clusterlabs
 LIBQB_INSTALL_STAGING = YES
+# We're patching configure.ac
+LIBQB_AUTORECONF = YES
+LIBQB_CONF_OPTS = --disable-tests
 LIBQB_DEPENDENCIES = libxml2
 
 # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test