diff --git a/requirements.txt b/requirements.txt
index d9a1c85d..41c02c61 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,9 +9,9 @@ python-neutronclient>=2.6.0 # Apache-2.0
 oslo.config>=3.2.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
 oslo.db>=4.1.0 # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
 oslo.log>=1.14.0 # Apache-2.0
-oslo.messaging!=2.8.0,!=3.1.0,>2.6.1 # Apache-2.0
+oslo.messaging>=4.0.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.utils>=3.4.0 # Apache-2.0
 oslo.rootwrap>=2.0.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index ee4328c8..aa127365 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,7 +10,7 @@ iso8601>=0.1.9 # MIT
 mox>=0.5.3 # Apache-2.0
 testtools>=1.4.0 # MIT
 fixtures>=1.3.1 # Apache-2.0/BSD
-tempest-lib>=0.13.0  # Apache-2.0
+tempest-lib>=0.13.0 # Apache-2.0
 
 # Doc requirements
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD