diff --git a/python-remoto.changes b/python-remoto.changes
index f4e457b..2cac3b3 100644
--- a/python-remoto.changes
+++ b/python-remoto.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed May 15 02:46:14 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Switch to pyproject macros.
+- No more greedy globs in %files.
+- Add patch support-pytest-8.patch:
+  * Don't call deprecated methods that break with Pytest 8.
+
 -------------------------------------------------------------------
 Fri Apr  8 09:21:48 UTC 2022 - pgajdos@suse.com
 
diff --git a/python-remoto.spec b/python-remoto.spec
index 979a7dc..1acfdef 100644
--- a/python-remoto.spec
+++ b/python-remoto.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-remoto
 #
-# Copyright (c) 2022 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
@@ -16,7 +16,6 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-remoto
 Version:        1.2.1
 Release:        0
@@ -26,9 +25,13 @@ URL:            https://github.com/alfredodeza/remoto
 Source0:        https://files.pythonhosted.org/packages/source/r/remoto/remoto-%{version}.tar.gz
 # https://github.com/alfredodeza/remoto/commit/aa74f65bb59dc46998e72e4bdcd070287e4e2af6
 Patch0:         python-remoto-no-mock.patch
+# PATCH-FIX-UPSTREAM gh#alfredodeza/remoto#69
+Patch1:         support-pytest-8.patch
 BuildRequires:  %{python_module execnet}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module virtualenv}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-execnet
@@ -49,11 +52,11 @@ connections and processes.
 
 %build
 export REMOTO_NO_VENDOR=no
-%python_build
+%pyproject_wheel
 
 %install
 export REMOTO_NO_VENDOR=no
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
@@ -62,6 +65,7 @@ export REMOTO_NO_VENDOR=no
 %files %{python_files}
 %license LICENSE
 %doc README.rst
-%{python_sitelib}/*
+%{python_sitelib}/remoto
+%{python_sitelib}/remoto-%{version}.dist-info
 
 %changelog
diff --git a/support-pytest-8.patch b/support-pytest-8.patch
new file mode 100644
index 0000000..4081f16
--- /dev/null
+++ b/support-pytest-8.patch
@@ -0,0 +1,37 @@
+From bb5177292ef497563e7c07addd8f50459b151299 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
+Date: Wed, 17 Apr 2024 09:26:30 +0200
+Subject: [PATCH] Replace setup() method with setup_method() to add
+ compatibility with pytest 8
+
+---
+ remoto/tests/test_process.py | 2 +-
+ remoto/tests/test_util.py    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/remoto/tests/test_process.py b/remoto/tests/test_process.py
+index a281672..136b7d5 100644
+--- a/remoto/tests/test_process.py
++++ b/remoto/tests/test_process.py
+@@ -7,7 +7,7 @@
+ 
+ class TestExtendPath(object):
+ 
+-    def setup(self):
++    def setup_method(self):
+         self.path = '/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin'
+ 
+     def test_no_environment_sets_path(self):
+diff --git a/remoto/tests/test_util.py b/remoto/tests/test_util.py
+index 0556156..363d593 100644
+--- a/remoto/tests/test_util.py
++++ b/remoto/tests/test_util.py
+@@ -18,7 +18,7 @@ def test_command_that_is_not_a_list(self):
+ 
+ class TestRemoteError(object):
+ 
+-    def setup(self):
++    def setup_method(self):
+         self.traceback = ('\n').join([
+             'Traceback (most recent call last):',
+             '  File "<string>", line 1, in <module>',