diff --git a/doc/requirements.txt b/doc/requirements.txt
index 070806f54..925ca4dc8 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,8 +1,5 @@
-# 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.
-sphinx>=2.0.0,!=2.1.0 # BSD
 docutils>=0.11 # OSI-Approved Open Source, Public Domain
 openstackdocstheme>=2.2.1 # Apache-2.0
 reno>=3.1.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
diff --git a/requirements.txt b/requirements.txt
index 48188d4e2..25fb9a198 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,14 @@
-# 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!=2.1.0,>=2.0.0 # Apache-2.0
-PyYAML>=3.13 # MIT
-platformdirs>=3 # MIT License
-requestsexceptions>=1.2.0 # Apache-2.0
-jsonpatch!=1.20,>=1.16 # BSD
-os-service-types>=1.7.0 # Apache-2.0
-keystoneauth1>=3.18.0 # Apache-2.0
-
-decorator>=4.4.1 # BSD
-jmespath>=0.9.0 # MIT
-iso8601>=0.1.11 # MIT
-netifaces>=0.10.4 # MIT
-
-dogpile.cache>=0.6.5 # BSD
 cryptography>=2.7 # BSD/Apache-2.0
-
+decorator>=4.4.1 # BSD
+dogpile.cache>=0.6.5 # BSD
 importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0
+iso8601>=0.1.11 # MIT
+jmespath>=0.9.0 # MIT
+jsonpatch!=1.20,>=1.16 # BSD
+keystoneauth1>=3.18.0 # Apache-2.0
+netifaces>=0.10.4 # MIT
+os-service-types>=1.7.0 # Apache-2.0
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
+platformdirs>=3 # MIT License
+PyYAML>=3.13 # MIT
+requestsexceptions>=1.2.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 3f22c9d11..b771e0ca3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,15 +1,11 @@
-# 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.
-hacking>=3.1.0,<4.0.0 # Apache-2.0
-
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD
+hacking>=3.1.0,<4.0.0 # Apache-2.0
 jsonschema>=3.2.0 # MIT
-prometheus-client>=0.4.2 # Apache-2.0
 oslo.config>=6.1.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
+prometheus-client>=0.4.2 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0
 statsd>=3.3.0
 stestr>=1.0.0 # Apache-2.0