diff --git a/lower-constraints.txt b/lower-constraints.txt
index 9b354e7c9b..5a766a06bb 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,5 +1,5 @@
 alembic==0.9.8
-amqp==2.2.2
+amqp==2.6.0
 aodhclient==0.9.0
 appdirs==1.4.3
 asn1crypto==0.24.0
@@ -15,19 +15,21 @@ cmd2==0.8.1
 contextlib2==0.5.5
 coverage==4.0
 croniter==0.3.4
-cryptography==2.1
+cryptography==2.5
 debtcollector==1.19.0
-decorator==4.2.1
+decorator==4.3.0
 deprecation==2.0
 doc8==0.6.0
 docker-pycreds==0.2.2
 docker==3.1.1
+docutils==0.13.1
 dogpile.cache==0.6.5
 enum-compat==0.0.2
 eventlet==0.18.2
 extras==1.0.0
 fasteners==0.14.1
 fixtures==3.0.0
+flake8==3.7.0
 future==0.16.0
 futurist==1.6.0
 gitdb2==2.0.3
@@ -47,9 +49,12 @@ linecache2==1.0.0
 lxml==4.5.0
 Mako==1.0.7
 MarkupSafe==1.1.1
-mccabe==0.2.1
+mccabe==0.6.0
+mock==3.0.3
 monotonic==1.4
+mox3==0.28.0
 msgpack==0.5.6
+msgpack-python==0.5.6
 munch==2.2.0
 netaddr==0.7.18
 netifaces==0.10.6
@@ -86,7 +91,6 @@ pika==0.10.0
 ply==3.11
 prettytable==0.7.2
 psutil==5.4.3
-psycopg2==2.8
 pyasn1==0.4.2
 pycadf==2.7.0
 pycparser==2.18
diff --git a/requirements.txt b/requirements.txt
index 35d59e85f3..3bf25655e1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 Babel!=2.4.0,>=2.3.4 # BSD
 croniter>=0.3.4 # MIT License
-cryptography>=2.1 # BSD/Apache-2.0
+cryptography>=2.5 # BSD/Apache-2.0
 debtcollector>=1.19.0  # Apache-2.0
 eventlet!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0,!=0.25.0,>=0.18.2 # MIT
 keystoneauth1>=3.18.0 # Apache-2.0
@@ -35,6 +35,7 @@ PasteDeploy>=1.5.0 # MIT
 aodhclient>=0.9.0 # Apache-2.0
 python-barbicanclient>=4.5.2 # Apache-2.0
 python-blazarclient>=1.0.1 # Apache-2.0
+python-ceilometerclient>=2.5.0
 python-cinderclient>=3.3.0 # Apache-2.0
 python-designateclient>=2.7.0 # Apache-2.0
 python-glanceclient>=2.8.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 95f10c2987..a181012c52 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,7 +15,6 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 kombu!=4.0.2,>=5.0.1 # BSD
 PyMySQL>=0.8.0 # MIT License
 oslotest>=3.2.0 # Apache-2.0
-psycopg2>=2.8 # LGPL/ZPL
 stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT