diff --git a/config.tests/qpa/xcb-poll-for-queued-event/xcb-poll-for-queued-event.cpp b/config.tests/qpa/xcb-poll-for-queued-event/xcb-poll-for-queued-event.cpp
index d15e5544233..8f93d64af52 100644
--- a/config.tests/qpa/xcb-poll-for-queued-event/xcb-poll-for-queued-event.cpp
+++ b/config.tests/qpa/xcb-poll-for-queued-event/xcb-poll-for-queued-event.cpp
@@ -40,7 +40,12 @@
 ****************************************************************************/
 
 #include <xcb/xcb.h>
+
+// FIXME This workaround can be removed for xcb-icccm > 3.8
+#define class class_name
 #include <xcb/xcb_icccm.h>
+#undef class
+
 #include <xcb/xfixes.h>
 #include <xcb/xcb_image.h>
 #include <xcb/xcb_keysyms.h>
diff --git a/config.tests/qpa/xcb/xcb.cpp b/config.tests/qpa/xcb/xcb.cpp
index 71b30fea5ab..50fb86fc625 100644
--- a/config.tests/qpa/xcb/xcb.cpp
+++ b/config.tests/qpa/xcb/xcb.cpp
@@ -40,7 +40,12 @@
 ****************************************************************************/
 
 #include <xcb/xcb.h>
+
+// FIXME This workaround can be removed for xcb-icccm > 3.8
+#define class class_name
 #include <xcb/xcb_icccm.h>
+#undef class
+
 #include <xcb/xfixes.h>
 #include <xcb/xcb_image.h>
 #include <xcb/xcb_keysyms.h>