diff --git a/bindep.txt b/bindep.txt
index cba81a40..cc937cb3 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,8 +1,8 @@
 # This is a cross-platform list tracking distribution packages needed for install and tests;
 # see https://docs.openstack.org/infra/bindep/ for additional information.
 
-mysql-client [platform:dpkg]
-mysql-server [platform:dpkg]
-postgresql
-postgresql-client [platform:dpkg]
-
+gcc [compile test]
+mysql-client [test platform:dpkg]
+mysql-server [test platform:dpkg]
+postgresql [test]
+postgresql-client [test platform:dpkg]
diff --git a/requirements.txt b/requirements.txt
index 27625fa2..3d949eb3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 SQLAlchemy>=0.8.3
-alembic==0.5.0
-beaker==1.6.5.post1
+alembic
+beaker
 beautifulsoup4
 cryptography>=1.0,!=1.3.0 # BSD/Apache-2.0
 docutils>=0.11
@@ -15,3 +15,4 @@ requests-cache>=0.4.9
 jsonschema>=2.0.0,<3.0.0
 PyJWT>=1.0.1  # MIT
 WebOb>=1.7.1  # MIT
+PyMySQL>=0.6.2,!=0.6.4