diff --git a/networking_brocade/test_discover/test_discover.py b/networking_brocade/test_discover/test_discover.py
index ffe9cc6..dcdd101 100644
--- a/networking_brocade/test_discover/test_discover.py
+++ b/networking_brocade/test_discover/test_discover.py
@@ -31,7 +31,6 @@ def load_tests(loader, tests, pattern):
                  './networking_brocade/vdx/tests/unit/ml2/drivers/brocade',
                  MLX_TEST_BASE_PATH + '/unit/ml2/drivers/brocade',
                  MLX_TEST_BASE_PATH + '/unit/services/l3_router/brocade',
-                 './networking_brocade/vyatta/tests'
                  }
     for test_dir in test_dirs:
         if not pattern:
diff --git a/requirements.txt b/requirements.txt
index c4dc620..6d7b2e7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,19 @@
 # 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>=0.6,!=0.7,<1.0
+pbr<2.0,>=1.4
 
-eventlet>=0.15.2
+eventlet>=0.17.4
 httplib2>=0.7.5
 netaddr>=0.7.12
-SQLAlchemy>=0.9.7,<=0.9.99
-alembic>=0.7.1
-six>=1.7.0
-oslo.config>=1.6.0  # Apache-2.0
-oslo.db>=1.3.0  # Apache-2.0
-oslo.messaging>=1.4.0,!=1.5.0
-oslo.serialization>=1.2.0               # Apache-2.0
-oslo.utils>=1.2.0                       # Apache-2.0
+SQLAlchemy<1.1.0,>=0.9.7
+alembic>=0.8.0
+six>=1.9.0
+oslo.config>=2.1.0  # Apache-2.0
+oslo.db>=2.0  # Apache-2.0
+oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0
+oslo.serialization>=1.4.0               # Apache-2.0
+oslo.utils>=2.0.0                       # Apache-2.0
 
 # This project does depend on neutron as a library, but the
 # openstack tooling does not play nicely with projects that
diff --git a/test-requirements.txt b/test-requirements.txt
index 4b032e4..567caac 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,19 +3,19 @@
 # process, which may cause wedges in the gate later.
 hacking>=0.10.0,<0.11
 
-cliff>=1.7.0  # Apache-2.0
+cliff>=1.14.0  # Apache-2.0
 coverage>=3.6
 discover
-fixtures>=0.3.14
-mock>=1.0
+fixtures>=1.3.1
+mock>=1.2
 python-subunit>=0.0.18
-requests-mock>=0.5.1  # Apache-2.0
+requests-mock>=0.6.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.2.0  # Apache-2.0
+oslosphinx>=2.5.0  # Apache-2.0
 oslo.concurrency>=0.3.0,!=0.4.0
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 testscenarios>=0.4
 WebOb>=1.2.3
 WebTest>=2.0
-oslotest>=1.2.0  # Apache-2.0
+oslotest>=1.10.0  # Apache-2.0