diff --git a/changelog.d/690.misc b/changelog.d/690.misc
new file mode 100644
index 00000000..2431c0cd
--- /dev/null
+++ b/changelog.d/690.misc
@@ -0,0 +1 @@
+Pin pytest to <7.0 until compatibility issues are resolved
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 78032a20..b781ff50 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -122,7 +122,7 @@ deps =
     dj42: Django>=4.2,<5.0
     djmain: https://github.com/django/django/archive/main.tar.gz
     msgpack>=0.6.0
-    pytest
+    pytest<7.0.0
     pytest-cov
     pytest-django
     pytest-pythonpath