diff --git a/requirements.txt b/requirements.txt
index 80d0aca..93741bf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,3 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
 pbr>=1.4
 cliff!=1.16.0,>=1.14.0  # Apache-2.0
 osc-lib>=1.0.1 # Apache-2.0
@@ -11,7 +7,3 @@ oslo.utils>=2.0.0 # Apache-2.0
 osprofiler>=1.4.0 # Apache-2.0
 keystoneauth1>=1.0.0
 pyparsing
-SQLAlchemy-Utils<=0.38.3
-sqlalchemy-migrate<=0.13.0
-SQLAlchemy<=1.4.41
-oslo.db<=12.3.1
diff --git a/setup.cfg b/setup.cfg
index 6cb7288..dbc0f83 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,6 +33,11 @@ test =
     testtools>=1.4.0
     pifpaf[gnocchi]>=0.23
     gnocchi[postgresql,file]
+    # FIXME: Remove these caps when aodh supports SQLAlchemy 2.0
+    SQLAlchemy-Utils<=0.38.3
+    sqlalchemy-migrate<=0.13.0
+    SQLAlchemy<=1.4.41
+    oslo.db<=12.3.1
     ;Disabled due to https://github.com/pypa/twine/issues/726
     ;aodh @ https://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[mysql]