diff --git a/tox.ini b/tox.ini
index 61a44c4..c9573d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 4.2.5
-envlist = py38,py39,pep8
+envlist = py38,py39,py311,pep8
 ignore_basepython_conflict = True
 
 [testenv]
@@ -20,8 +20,12 @@ passenv =
     OS_LOG_CAPTURE
 # NOTE(tonyb): This project has chosen to *NOT* consume upper-constraints.txt
 # NOTE(jd): the -e is on its own line so it is passed a separate argument to pip
+# NOTE(mmagr): Recent compatibility fixes for gnocchi (werkzeug 2.x vs. 3.x)
+#              are not included in any release yet. Remove gnocchi dep override
+#              once above is not true.
 deps =
     .[test]
+    git+https://github.com/gnocchixyz/gnocchi.git
     http://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[mysql]
 commands = pifpaf run aodh -- stestr run --slowest {posargs}