diff --git a/tox.ini b/tox.ini
index 39f4905052..a6e45ca466 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,18 +5,19 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-# tox is silly... these need to be separated by a newline....
-whitelist_externals = bash
-                      find
-                      rm
-                      env
+whitelist_externals =
+  bash
+  find
+  rm
+  env
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-setenv = VIRTUAL_ENV={envdir}
-         LANGUAGE=en_US
-         LC_ALL=en_US.utf-8
-         OS_STDOUT_CAPTURE=1
-         OS_STDERR_CAPTURE=1
-         OS_TEST_TIMEOUT=160
+setenv =
+  VIRTUAL_ENV={envdir}
+  LANGUAGE=en_US
+  LC_ALL=en_US.utf-8
+  OS_STDOUT_CAPTURE=1
+  OS_STDERR_CAPTURE=1
+  OS_TEST_TIMEOUT=160
 deps = -r{toxinidir}/test-requirements.txt
 commands =
   find . -type f -name "*.pyc" -delete
@@ -26,22 +27,22 @@ passenv = OS_DEBUG GENERATE_HASHES
 
 [testenv:py27]
 commands =
-    {[testenv]commands}
-    stestr run {posargs}
-    env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler'
-    stestr slowest
+  {[testenv]commands}
+  stestr run {posargs}
+  env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler'
+  stestr slowest
 
 [testenv:py35]
 commands =
-    {[testenv]commands}
-    stestr run --blacklist-file=tests-py3.txt {posargs}
-    env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler'
+  {[testenv]commands}
+  stestr run --blacklist-file=tests-py3.txt {posargs}
+  env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler'
 
 [testenv:py36]
 commands =
-    {[testenv]commands}
-    stestr run --blacklist-file=tests-py3.txt '{posargs}'
-    env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler'
+  {[testenv]commands}
+  stestr run --blacklist-file=tests-py3.txt {posargs}
+  env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler'
 
 [testenv:pep8]
 basepython = python2.7
@@ -88,7 +89,7 @@ basepython = python3.5
 usedevelop = True
 setenv = {[testenv]setenv}
 commands =
-    {[testenv]commands}
+  {[testenv]commands}
 # NOTE(cdent): The group_regex describes how stestr will group tests into the
 # same process when running concurently. The following ensures that gabbi tests
 # coming from the same YAML file are all in the same process. This is important
@@ -97,13 +98,14 @@ commands =
 # special way. See the following for more details.
 # http://stestr.readthedocs.io/en/latest/MANUAL.html#grouping-tests
 # https://gabbi.readthedocs.io/en/latest/#purpose
-    stestr --test-path=./nova/tests/functional --group_regex=nova\.tests\.functional\.api\.openstack\.placement\.test_placement_api(?:\.|_)([^_]+) run {posargs}
+  stestr --test-path=./nova/tests/functional --group_regex=nova\.tests\.functional\.api\.openstack\.placement\.test_placement_api(?:\.|_)([^_]+) run {posargs}
 
 [testenv:api-samples]
 usedevelop = True
-setenv = {[testenv]setenv}
-         GENERATE_SAMPLES=True
-         PYTHONHASHSEED=0
+setenv =
+  {[testenv]setenv}
+  GENERATE_SAMPLES=True
+  PYTHONHASHSEED=0
 commands =
   find . -type f -name "*.pyc" -delete
   stestr --test-path=./nova/tests/functional/api_sample_tests run {posargs}