diff --git a/tox.ini b/tox.ini
index 99568021004b145a86acdc7020b9b4257447f8c7..95f637a61b51661bb86cef43594cc1adc9c36d23 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,11 +8,18 @@ basepython = python2
 deps =
     Fabric
     pelican
-commands =
-    build: fab build
-    serve: fab reserve
-    publish:
-        fab publish
-        git push
 whitelist_externals =
     git
+
+[testenv:build]
+commands =
+    fab build
+
+[testenv:serve]
+commands =
+    fab reserve
+
+[testenv:publish]
+commands =
+    fab publish
+    git push