diff --git a/tox.ini b/tox.ini
index fa4214bd0..a3f81b7e9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,48 +1,57 @@
 [tox]
 minversion = 2.0
-envlist = cover,
-    docs,
-    pep8,
-    py27,
-    py34,
-    py35,
-    pylint,
-    update-states
+envlist =
+  cover,
+  docs,
+  pep8,
+  py27,
+  py34,
+  py35,
+  pylint,
+  update-states
 
 [testenv]
 basepython = python3
-setenv = VIRTUAL_ENV={envdir}
-         BRANCH_NAME=master
-         CLIENT_NAME=taskflow
+setenv =
+  VIRTUAL_ENV={envdir}
+  BRANCH_NAME=master
+  CLIENT_NAME=taskflow
 install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 # We need to install a bit more than just `test' because those drivers have
 # custom tests that we always run
-deps = .[test,workers,zookeeper,database,redis,eventlet]
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+deps =
+  .[test,workers,zookeeper,database,redis,eventlet]
+commands =
+  python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:docs]
-deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -E -W -b html doc/source doc/build/html
-    doc8 doc/source
+deps =
+  -r{toxinidir}/doc/requirements.txt
+commands =
+  sphinx-build -E -W -b html doc/source doc/build/html
+  doc8 doc/source
 
 [testenv:update-states]
-deps = {[testenv]deps}
-    pydot2
+deps =
+  {[testenv]deps}
+  pydot2
 commands = {toxinidir}/tools/update_states.sh
 
 [testenv:pep8]
 commands =
-    flake8 {posargs}
-    doc8 doc/source
+  flake8 {posargs}
+  doc8 doc/source
 
 [testenv:pylint]
-deps = {[testenv]deps}
-    pylint==0.26.0
+deps =
+  {[testenv]deps}
+  pylint==0.26.0
 commands = pylint --rcfile=pylintrc taskflow
 
 [testenv:cover]
-deps = {[testenv]deps}
-   coverage>=3.6
+deps =
+  {[testenv]deps}
+  coverage>=3.6
 commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:venv]
@@ -54,9 +63,10 @@ exclude = .venv,.tox,dist,doc,*egg,.git,build,tools
 ignore = E721
 
 [hacking]
-import_exceptions = six.moves
-    taskflow.test.mock
-    unittest.mock
+import_exceptions =
+  six.moves
+  taskflow.test.mock
+  unittest.mock
 
 [doc8]
 # Settings for doc8: