diff --git a/python-paramiko.changes b/python-paramiko.changes
index 40cace3..184e566 100644
--- a/python-paramiko.changes
+++ b/python-paramiko.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 14 03:27:34 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch support-pytest-8.patch:
+  * Use non-deprecated setup method to support pytest >= 8.
+
 -------------------------------------------------------------------
 Wed Dec 20 06:57:15 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
 
diff --git a/python-paramiko.spec b/python-paramiko.spec
index 2b398c9..68dfd49 100644
--- a/python-paramiko.spec
+++ b/python-paramiko.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-paramiko
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,8 @@ Patch0:         paramiko-test_extend_timeout.patch
 Patch1:         remove-icecream-dep.patch
 # PATCH-FIX-OPENSUSE use 64-bit value of sys.maxsize to prevent test failure on 32-bit
 Patch2:         use-64-bit-maxsize-everywhere.patch
+# PATCH-FIX-UPSTREAM gh#paramiko/paramiko#2349 Use non-deprecated setup method name to support pytest >= 8
+Patch3:         support-pytest-8.patch
 BuildRequires:  %{python_module PyNaCl >= 1.0.1}
 BuildRequires:  %{python_module Sphinx}
 BuildRequires:  %{python_module bcrypt >= 3.2}
diff --git a/support-pytest-8.patch b/support-pytest-8.patch
new file mode 100644
index 0000000..56c2722
--- /dev/null
+++ b/support-pytest-8.patch
@@ -0,0 +1,23 @@
+From d71046151d9904df467ff72709585cde39cdd4ca Mon Sep 17 00:00:00 2001
+From: Alex Gaynor <alex.gaynor@gmail.com>
+Date: Sat, 27 Jan 2024 17:04:18 -0500
+Subject: [PATCH] Use pytest's setup_method -- in pytest 8 the nose method
+ setup is deprecated
+
+---
+ tests/test_config.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_config.py b/tests/test_config.py
+index 2e49aa3de..1e623e0ad 100644
+--- a/tests/test_config.py
++++ b/tests/test_config.py
+@@ -53,7 +53,7 @@ def load_config(name):
+ 
+ 
+ class TestSSHConfig:
+-    def setup(self):
++    def setup_method(self):
+         self.config = load_config("robey")
+ 
+     def test_init(self):