diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..6222fa7
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,4 @@
+<multibuild>
+  <package>test</package>
+  <package>wheel</package>
+</multibuild>
diff --git a/python-python-xlib.changes b/python-python-xlib.changes
index 73e4782..3a97a6d 100644
--- a/python-python-xlib.changes
+++ b/python-python-xlib.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Feb 26 12:44:54 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 0.31:
+  * XInput: add event methods 
+  * XResource: first implementation (thanks @alebastr).
+  * Randr: add missing parameters to delete_output_mode function
+- use multibuild to avoid expensive pytest-xvfb dependency
+  (should reduce rebuild_time of 1-MinimalX by ~ 12 minutes)
+
 -------------------------------------------------------------------
 Thu Aug 12 11:29:05 UTC 2021 - Yifan Jiang <yfjiang@suse.com>
 
diff --git a/python-python-xlib.spec b/python-python-xlib.spec
index 47e08ec..3a8759a 100644
--- a/python-python-xlib.spec
+++ b/python-python-xlib.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package python-python-xlib
+# spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,8 +22,17 @@
 %else
 %define         oldpython python
 %endif
-Name:           python-python-xlib
-Version:        0.29
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%bcond_with wheel
+%endif
+Name:           python-python-xlib%{psuffix}
+Version:        0.31
 Release:        0
 Summary:        Python X11 interface
 License:        LGPL-2.1-or-later
@@ -32,11 +41,13 @@ URL:            https://github.com/python-xlib/python-xlib
 Source:         https://files.pythonhosted.org/packages/source/p/python-xlib/python-xlib-%{version}.tar.gz
 # PATCH-FEATURE-UPSTREAM remove-mock.patch -- gh#python-xlib/python-xlib#186
 Patch0:         remove-mock.patch
-BuildRequires:  %{python_module pytest-xvfb}
-BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  %{python_module setuptools}
+%if %{with test}
+BuildRequires:  %{python_module pytest-xvfb}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module six >= 1.10.0}
+%endif
 %if 0%{suse_version} < 1550
 BuildRequires:  python-mock
 BuildRequires:  xauth
@@ -67,17 +78,21 @@ dos2unix CHANGELOG.md README.rst TODO dev-requirements.txt test/*
 %build
 %python_build
 
+%if %{with test}
+%check
+%pytest -rs
+
+%else
+
 %install
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%check
-%pytest -rs
-
 %files %{python_files}
 %license LICENSE
 %doc CHANGELOG.md README.rst TODO
 %{python_sitelib}/Xlib/
 %{python_sitelib}/python_xlib-*
+%endif
 
 %changelog
diff --git a/python-xlib-0.29.tar.gz b/python-xlib-0.29.tar.gz
deleted file mode 100644
index c9db7c7..0000000
--- a/python-xlib-0.29.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e4bcb756f4aa05be7b82ee21de0ba04d73414018727b42ebd9fbcf409ea75d13
-size 263519
diff --git a/python-xlib-0.31.tar.gz b/python-xlib-0.31.tar.gz
new file mode 100644
index 0000000..c4aab71
--- /dev/null
+++ b/python-xlib-0.31.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74d83a081f532bc07f6d7afcd6416ec38403d68f68b9b9dc9e1f28fbf2d799e9
+size 266303