diff --git a/requirements.txt b/requirements.txt
index ea632aa8..61124356 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,9 +2,6 @@
 # date but we do not test them so no guarantee of having them all correct. If
 # you find any incorrect lower bounds, let us know or propose a fix.
 
-# 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.
 elasticsearch<3.0.0,>=2.0.0 # Apache-2.0
 falcon>=1.0.0 # Apache-2.0
 jsonschema>=3.2.0 # MIT
@@ -20,5 +17,5 @@ oslo.middleware>=3.31.0 # Apache-2.0
 oslo.policy>=4.5.0 # Apache-2.0
 oslo.serialization>=2.25.0 # Apache-2.0
 oslo.upgradecheck>=1.3.0 # Apache-2.0
-SQLAlchemy>=1.2.19 # MIT
+SQLAlchemy>=2.0.5 # MIT
 alembic>=1.8.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 41ca90af..3370cf29 100644
--- a/test-requirements.txt
+++ b/test-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.
-
 pylint>=2.4.0 # GPLv2
 coverage>=4.5.1 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
@@ -9,7 +5,7 @@ oslotest>=3.3.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 stestr>=2.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
-testresources>=2.0.1
-testscenarios>=0.5.0
+testresources>=2.0.1 # Apache-2.0/BSD
+testscenarios>=0.5.0 # Apache-2.0/BSD
 astroid>=2.2.0,<=3 # LGPLv2.1
 PyMySQL>=0.7.6 # MIT License
diff --git a/tox.ini b/tox.ini
index 94e6453a..cb78d43a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.18.0
-envlist = py3,pep8,pylint,docs
+envlist = py3,pep8,pylint
 
 [testenv]
 usedevelop = true
@@ -12,8 +12,6 @@ deps =
   -r{toxinidir}/test-requirements.txt
 setenv =
   PYTHONDONTWRITEBYTECODE=1
-# TODO(stephenfin): Remove once we bump our upper-constraint to SQLAlchemy 2.0
-  SQLALCHEMY_WARN_20=1
 passenv =
   HTTP_PROXY
   HTTPS_PROXY
@@ -43,7 +41,6 @@ deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/up
        -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf doc/build
-#  sphinx-build -W --keep-going -b html api-ref/source api-ref/build/html
   sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:api-ref]