diff --git a/tox.ini b/tox.ini
index 9a579f24a7..5d778cade5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 
 [testenv:pep8]
 commands =
-    flake8
+  flake8
 
 [testenv:venv]
 commands = {posargs}
@@ -21,16 +21,16 @@ commands = python setup.py build_sphinx
 
 [testenv:validate-contents]
 commands =
-    {toxinidir}/tools/validate-all-json.sh
-    {toxinidir}/tools/validate-all-yaml.sh
-    {toxinidir}/tools/validate-all-maintainer.sh
+  {toxinidir}/tools/validate-all-json.sh
+  {toxinidir}/tools/validate-all-yaml.sh
+  {toxinidir}/tools/validate-all-maintainer.sh
 
 [testenv:bashate]
 deps = bashate
 whitelist_externals = bash
 # tox improperly interprets # and {1} in regex, so match on [[:punct:]]+
 commands =
-    bash -c "files=`egrep -rlI --exclude-dir .git --exclude-dir .tox '^[[:punct:]]+!/(bin/|/usr/bin/env )(ba)?sh' .` && bashate $files"
+  bash -c "files=`egrep -rlI --exclude-dir .git --exclude-dir .tox '^[[:punct:]]+!/(bin/|/usr/bin/env )(ba)?sh' .` && bashate $files"
 
 [testenv:setupenv]
 whitelist_externals = bash
@@ -41,66 +41,66 @@ whitelist_externals = find
                       bash
                       sudo
 commands =
-   find . -type f -name "*.pyc" -delete
-   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.BuildTestCentosBinary
+  find . -type f -name "*.pyc" -delete
+  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+  sudo -g docker testr run test_build.BuildTestCentosBinary
 
 [testenv:build-centos-source]
 whitelist_externals = find
                       bash
                       sudo
 commands =
-   find . -type f -name "*.pyc" -delete
-   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.BuildTestCentosSource
+  find . -type f -name "*.pyc" -delete
+  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+  sudo -g docker testr run test_build.BuildTestCentosSource
 
 [testenv:build-ubuntu-source]
 whitelist_externals = find
                       bash
                       sudo
 commands =
-   find . -type f -name "*.pyc" -delete
-   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.BuildTestUbuntuSource
+  find . -type f -name "*.pyc" -delete
+  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+  sudo -g docker testr run test_build.BuildTestUbuntuSource
 
 [testenv:deploy-centos-binary]
 whitelist_externals = find
                       bash
                       sudo
 commands =
-   find . -type f -name "*.pyc" -delete
-   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.DeployTestCentosBinary
-   sudo tests/deploy_aio.sh centos binary
+  find . -type f -name "*.pyc" -delete
+  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+  sudo -g docker testr run test_build.DeployTestCentosBinary
+  sudo tests/deploy_aio.sh centos binary
 
 [testenv:deploy-centos-source]
 whitelist_externals = find
                       bash
                       sudo
 commands =
-   find . -type f -name "*.pyc" -delete
-   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.DeployTestCentosSource
-   sudo tests/deploy_aio.sh centos source
+  find . -type f -name "*.pyc" -delete
+  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+  sudo -g docker testr run test_build.DeployTestCentosSource
+  sudo tests/deploy_aio.sh centos source
 
 [testenv:deploy-ubuntu-source]
 whitelist_externals = find
                       bash
                       sudo
 commands =
-   find . -type f -name "*.pyc" -delete
-   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.DeployTestUbuntuSource
-   sudo tests/deploy_aio.sh ubuntu source
+  find . -type f -name "*.pyc" -delete
+  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+  sudo -g docker testr run test_build.DeployTestUbuntuSource
+  sudo tests/deploy_aio.sh ubuntu source
 
 [testenv:deploy-multinode-ubuntu-source]
 whitelist_externals = find
                       bash
                       sudo
 commands =
-   find . -type f -name "*.pyc" -delete
-   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.BuildTestUbuntuSource
+  find . -type f -name "*.pyc" -delete
+  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+  sudo -g docker testr run test_build.BuildTestUbuntuSource
 
 [flake8]
 show-source = True