diff --git a/fix-tests.patch b/fix-tests.patch
new file mode 100644
index 0000000..a1bd024
--- /dev/null
+++ b/fix-tests.patch
@@ -0,0 +1,22 @@
+From 408273fb77551d69ae88b76666c15ded0d98caf3 Mon Sep 17 00:00:00 2001
+From: Florian Schulze <mail@florian-schulze.net>
+Date: Mon, 10 Mar 2025 09:04:38 +0100
+Subject: [PATCH] Support fully normalized wheel names in tests.
+
+This is caused by setuptools v75.8.1 where the wheel file naming was changed.
+---
+ client/testing/test_test.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: devpi-client-7.2.0/testing/test_test.py
+===================================================================
+--- devpi-client-7.2.0.orig/testing/test_test.py
++++ devpi-client-7.2.0/testing/test_test.py
+@@ -353,6 +353,7 @@ class TestWheel:
+             "zip" + os.sep + f"{pkgname_norm}-1.0"))
+         assert wheel1[0].basename in {
+             f"{pkgname}-1.0-py2.py3-none-any.whl",
++            f"{pkgname_norm}-1.0-py2.py3-none-any.whl",
+             f"{pkgname_whl}-1.0-py2.py3-none-any.whl"}
+         assert str(wheel1[1].path_unpacked).endswith(wheel1[0].basename)
+ 
diff --git a/python-devpi-client.changes b/python-devpi-client.changes
index 0c67464..ca2d607 100644
--- a/python-devpi-client.changes
+++ b/python-devpi-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb  4 14:04:07 UTC 2026 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Fix tests, add fix-tests.patch upstream patch,
+  gh#devpi/devpi@408273fb7755
+
 -------------------------------------------------------------------
 Thu Nov  7 12:26:57 UTC 2024 - Markéta Machová <mmachova@suse.com>
 
diff --git a/python-devpi-client.spec b/python-devpi-client.spec
index 3098c41..0a6c873 100644
--- a/python-devpi-client.spec
+++ b/python-devpi-client.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-devpi-client
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,8 @@ Summary:        Client for devpi
 License:        MIT
 URL:            https://github.com/devpi/devpi
 Source:         https://files.pythonhosted.org/packages/source/d/devpi-client/devpi-client-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM fix-tests.patch -- gh#devpi/devpi@408273fb7755
+Patch0:         fix-tests.patch
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
@@ -58,6 +60,7 @@ BuildRequires:  %{python_module colorama}
 BuildRequires:  %{python_module devpi-client = %{version}}
 BuildRequires:  %{python_module devpi-common >= 4}
 BuildRequires:  %{python_module devpi-server}
+BuildRequires:  %{python_module pytest-mock}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  git-core
 %endif
@@ -105,6 +108,8 @@ donttest+=" or test_simple_install_missing_venvdir"
 donttest+=" or test_main_example or test_specific_version or test_pkgname_with_dashes"
 # broken tests with tox
 donttest+=" or test_toxresult_forbidden"
+# broken test because of pyramid: gh#Pylons/pyramid#3731
+donttest+=" or test_whitelist_setting"
 %pytest -k "not ($donttest)"
 %endif