diff --git a/.zuul.yaml b/.zuul.yaml
index 7b52b77..c09f07d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,6 @@
+---
 - project:
     templates:
       - check-requirements
-      - openstack-lower-constraints-jobs
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-wallaby-jobs
       - release-notes-jobs-python3
diff --git a/lower-constraints.txt b/lower-constraints.txt
deleted file mode 100644
index 0feb7fb..0000000
--- a/lower-constraints.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-alabaster==0.7.10
-Babel==2.3.4
-coverage==4.0
-docutils==0.11
-dulwich==0.15.0
-extras==1.0.0
-fixtures==3.0.0
-imagesize==0.7.1
-Jinja2==2.10
-linecache2==1.0.0
-MarkupSafe==1.0
-mccabe==0.2.1
-openstackdocstheme==2.2.1
-pbr==2.0.0
-pep257==0.7.0
-prettytable==0.7.2
-Pygments==2.2.0
-python-ldap==3.0.0
-python-mimeparse==1.6.0
-python-subunit==1.0.0
-pytz==2013.6
-requests==2.14.2
-six==1.10.0
-snowballstemmer==1.2.1
-Sphinx==2.0.0
-sphinxcontrib-websupport==1.0.1
-stestr==2.0.0
-testresources==2.0.0
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0
diff --git a/requirements.txt b/requirements.txt
index 624fd17..9f5f7d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,2 @@
-# 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.
 python-ldap>=3.0.0 # PSF
-PrettyTable<0.8,>=0.7.2
+PrettyTable>=0.7.2
diff --git a/test-requirements.txt b/test-requirements.txt
index 2110e90..b8e8e41 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1,3 @@
-# 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.
-# of appearance.
-
 hacking>=3.0,<3.1.0 # Apache-2.0
 flake8-docstrings==0.2.1.post1 # MIT
 
diff --git a/tox.ini b/tox.ini
index f14179e..70f611f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,24 +1,22 @@
 [tox]
 minversion = 3.1.1
 skipsdist = True
-envlist = py37,pep8,cover,docs,releasenotes
-ignore_basepython_conflict = True
+envlist = pep8,cover,docs,releasenotes
+ignore_basepython_conflict = true
 
 [testenv]
-usedevelop = True
-install_command = pip install {opts} {packages}
-setenv = VIRTUAL_ENV={envdir}
-         OS_STDOUT_NOCAPTURE=False
-         OS_STDERR_NOCAPTURE=False
-
-deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-       -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-commands = find . -type f -name "*.pyc" -delete
-           stestr run --slowest {posargs}
-whitelist_externals = find
 basepython = python3
+usedevelop = True
+setenv =
+  OS_STDOUT_NOCAPTURE=False
+  OS_STDERR_NOCAPTURE=False
+  PYTHONDONTWRITEBYTECODE=1
+deps =
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
+commands =
+  stestr run --slowest {posargs}
 
 [testenv:pep8]
 commands =
@@ -29,12 +27,12 @@ commands = {posargs}
 
 [testenv:cover]
 setenv =
-    PYTHON=coverage run --source ldappool --parallel-mode
+  PYTHON=coverage run --source ldappool --parallel-mode
 commands =
-    stestr run {posargs}
-    coverage combine
-    coverage html -d cover
-    coverage xml -o cover/coverage.xml
+  stestr run {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
 
 [flake8]
 # D100: Missing docstring in public module
@@ -52,17 +50,12 @@ exclude = .venv,.tox,dist,doc,*egg,build
 
 [testenv:docs]
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-       -r{toxinidir}/doc/requirements.txt
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/doc/requirements.txt
 commands=
-    sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
+  sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
 deps = {[testenv:docs]deps}
-commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
-
-[testenv:lower-constraints]
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
+commands =
+  sphinx-build -W -b html releasenotes/source releasenotes/build/html