diff --git a/requirements.txt b/requirements.txt
index 928d4b6f..003ad0c9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+setuptools>=65.0.0,<82  # pkg_resources removed in 82; required by sqlalchemy-migrate
 eventlet
 keystoneauth1
 keystonemiddleware
diff --git a/test-requirements.txt b/test-requirements.txt
index fea111a7..32d0a87c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,9 +2,9 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
+setuptools>=65.0.0,<82  # pkg_resources removed in 82; required by sqlalchemy-migrate
 hacking>=6.0.1,<=6.0.1 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.2.1 # MIT
 oslotest>=3.8.0 # Apache-2.0
-stestr>=2.0.0 # Apache-2.0
-
+stestr>=4.2.1 # Apache-2.0