diff --git a/devstack/settings b/devstack/settings
index d252a8e48e..f7f2ef45f3 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -18,7 +18,7 @@ fi
 
 # Gnocchi default archive_policy for Ceilometer
 # TODO(sileht): when Gnocchi 4.0 is out use the tarball instead
-GNOCCHI_GIT_PATH=${GNOCCHI_GIT_PATH:-git+https://github.com/gnocchixyz/gnocchi.git@4.4.1#egg=gnocchi}
+GNOCCHI_GIT_PATH=${GNOCCHI_GIT_PATH:-git+https://github.com/gnocchixyz/gnocchi.git@4.4.2#egg=gnocchi}
 if [ -n "$GNOCCHI_ARCHIVE_POLICY_TEMPEST" ]; then
     GNOCCHI_ARCHIVE_POLICY=$GNOCCHI_ARCHIVE_POLICY_TEMPEST
 else
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 9bab59b61a..a1ef545b3e 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -34,6 +34,7 @@ python-neutronclient==6.7.0
 python-novaclient==9.1.0
 python-swiftclient==3.2.0
 python-zaqarclient==1.3.0
+python-subunit==1.4.0
 PyYAML==5.1
 requests==2.14.2
 requests-aws==0.1.4
diff --git a/test-requirements.txt b/test-requirements.txt
index 755b386d30..b64e0abd83 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,3 +15,4 @@ gabbi>=1.30.0 # Apache-2.0
 requests-aws>=0.1.4 # BSD License (3 clause)
 stestr>=2.0.0 # Apache-2.0
 testresources>=2.0.1 # Apache-2.0
+setuptools<=57.4.0 # Apache-2.0