diff --git a/.gitignore b/.gitignore
index 0109590838..5a2c2a2770 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ MANIFEST
 .coverage
 .idea
 .cache/
-.tox/
+.tox*/
 build/
 
 # UI
diff --git a/tox.ini b/tox.ini
index ff0e41c276..f41ebfbd9d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist = py27, py35, docs, lint
 skipsdist = True
+toxworkdir={env:TOX_WORK_DIR:.tox}
 
 [testenv]
 deps =