diff --git a/prepare-and-run-pylint.sh b/prepare-and-run-pylint.sh
index 933e074a35f5c53190957ab587aeb994c6313aa1..1876e90f91494a39f9125094b19e61b94428d3b1 100644
--- a/prepare-and-run-pylint.sh
+++ b/prepare-and-run-pylint.sh
@@ -13,11 +13,13 @@ if ! test -f .pylintrc.yml; then
   curl -o .pylintrc.yml "${ci_support}/.pylintrc-default.yml"
 fi
 
-# <2.6 version bound put in place out of an abundance of cautiousness, no particular reason
-# 2020-07-15 AK
-# pytest is being installed since test_*.py modules may import pytest, which
-# pylint may inspect.
-$PY_EXE -m pip install "pylint<2.6" PyYAML pytest
+# - pylint<2.6 version bound put in place out of an abundance of cautiousness, no
+#   particular reason. -- 2020-07-15 AK
+# - pytest is being installed since test_*.py modules may import pytest, which
+#   pylint may inspect.
+# - pytest<6 because https://github.com/pytest-dev/pytest/pull/7565 did not make
+#   pytest-6.0.0.
+$PY_EXE -m pip install "pylint<2.6" PyYAML "pytest<6"
 
 PYLINT_RUNNER_ARGS="--yaml-rcfile=.pylintrc.yml"