diff --git a/requirements.txt b/requirements.txt
index 04eb6b0..c86db38 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
-pbr>=1.8
-alembic>=0.4.1
-oslo.config>=1.4.0.0a3
-oslo.db>=2.1.0,<4.15.0
+pbr>=2.0.0,!=2.1.0
+alembic>=0.8.10
+oslo.config>=4.0.0
+oslo.db>=4.24.0
 python-subunit>=0.0.18
-six>=1.5.2
-SQLAlchemy>=0.8.2
-stevedore>=1.3.0
+six>=1.9.0
+SQLAlchemy>=1.0.10,!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8
+stevedore>=1.20.0
 python-dateutil>=2.4.2
diff --git a/test-requirements.txt b/test-requirements.txt
index 78b3cca..bfadf82 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,3 +14,7 @@ oslo.concurrency>=3.5.0
 # releasenotes
 reno>=0.1.1 # Apache2
 openstackdocstheme>=1.11.0 # Apache-2.0
+# This is needed for oslo.db test code to be imported, it's not
+# directly installed by oslo.db
+testresources>=0.2.4 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD