diff --git a/pytest.spec b/pytest.spec
index 39b6f0e..177e53e 100644
--- a/pytest.spec
+++ b/pytest.spec
@@ -25,14 +25,12 @@ Patch:          pytest-7.1.3-fix-xfails.patch
 
 # Only disabling the optional tests is a more complex but careful approach
 # Pytest will skip the related tests, so we only conditionalize the BRs
-# This bcond is ignored when tests are disabled
-%bcond_without optional_tests
+%bcond optional_tests %{with tests}
 
 # To run the tests in %%check we use pytest-timeout
 # When building pytest for the first time with new Python version
 # that is not possible as it depends on pytest
-# The bcond is ignored when tests are disabled
-%bcond_without timeout
+%bcond timeout %{with tests}
 
 # When building pytest for the first time with new Python version
 # we also don't have sphinx yet and cannot build docs.