diff --git a/pyparsing.spec b/pyparsing.spec
index 0d14139..f8c1304 100644
--- a/pyparsing.spec
+++ b/pyparsing.spec
@@ -66,8 +66,7 @@ dos2unix -k examples/*
 
 
 %generate_buildrequires
-# tox lists only the [diagrams] extra and coverage as deps, so we bypass it
-%pyproject_buildrequires %{?with_tests:-x diagrams}
+%pyproject_buildrequires
 
 
 %build
@@ -88,9 +87,11 @@ popd
 
 
 %check
-%pyproject_check_import %{!?with_tests:-e pyparsing.diagram}
+%pyproject_check_import -e pyparsing.diagram
 %if %{with tests}
-%pytest -v
+# Exclude test_range_check, testEmptyExpressionsAreHandledProperly and the test_diagram.py module
+# because they depend on python-railroad-diagrams
+%pytest -v -k 'not test_range_check and not testEmptyExpressionsAreHandledProperly' --ignore tests/test_diagram.py
 %endif