diff --git a/tox.ini b/tox.ini
index d341908b..1cd3c4e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py33, py34, py35, py36, py36-env27, py36-env33, py36-env34, py36-env35
+envlist = py27, py33, py34, py35, py36
 [testenv]
 deps =
     pytest>=2.3.5, < 3.3
@@ -9,6 +9,7 @@ deps =
 # coloroma for colored debug output
     colorama
     -rrequirements.txt
+passenv = JEDI_TEST_ENVIRONMENT
 setenv =
 # https://github.com/tomchristie/django-rest-framework/issues/1957
 # tox corrupts __pycache__, solution from here: