diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt
index 1c0af171f3..185c6e4494 100644
--- a/docs/internals/contributing/writing-code/unit-tests.txt
+++ b/docs/internals/contributing/writing-code/unit-tests.txt
@@ -324,6 +324,13 @@ in ``tests/auth_tests``.
 Troubleshooting
 ===============
 
+Test suite hangs or shows failures on ``master`` branch
+-------------------------------------------------------
+
+Ensure you have the latest point release of a :ref:`supported Python version
+<faq-python-version-support>`, since there are often bugs in earlier versions
+that may cause the test suite to fail or hang.
+
 Many test failures with ``UnicodeEncodeError``
 ----------------------------------------------