diff --git a/python-pytest-trio.changes b/python-pytest-trio.changes
index add6705..1bbc849 100644
--- a/python-pytest-trio.changes
+++ b/python-pytest-trio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  7 04:13:11 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Do not remove pytest.ini, we need the configuration for pytest 8.4.
+- Do not play around with test directory name.
+
 -------------------------------------------------------------------
 Wed May  7 07:00:40 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
 
diff --git a/python-pytest-trio.spec b/python-pytest-trio.spec
index be64a0d..ce2c3a1 100644
--- a/python-pytest-trio.spec
+++ b/python-pytest-trio.spec
@@ -36,8 +36,8 @@ BuildArch:      noarch
 # SECTION test requirements
 BuildRequires:  %{python_module hypothesis >= 3.64}
 BuildRequires:  %{python_module outcome >= 1.1.0}
-# we really need newer pytest in tests than is required by the package
 BuildRequires:  %{python_module pytest >= 7.2.0}
+BuildRequires:  %{python_module pytest-cov}
 BuildRequires:  %{python_module trio >= 0.22.0}
 # /SECTION
 %python_subpackages
@@ -48,22 +48,17 @@ a friendly library for concurrency and async I/O in Python.
 
 %prep
 %autosetup -p1 -n pytest-trio-%{version}
-
-rm pytest.ini
 rm pytest_trio/_tests/test_hypothesis_interaction.py
-mv pytest_trio/_tests/ tests
 
 %build
 %pyproject_wheel
 
 %install
 %pyproject_install
-%{python_expand rm -r %{buildroot}%{$python_sitelib}/tests/
-%fdupes %{buildroot}%{$python_sitelib}
-}
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%pytest
+%pytest -k 'not (test_skip_and_xfail or test_error_collection)'
 
 %files %{python_files}
 %doc README.rst