diff --git a/tox.ini b/tox.ini
index ccc39eb178..94c86e2008 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,13 +23,15 @@ commands =
 deps =
     -rrequirements.txt
     -rrequirements-dev.txt
+    mysql: .[mysql]
+    postgres: .[postgres]
 setenv =
     PYTHONPATH = {toxinidir}
     SUPERSET_CONFIG = tests.superset_test_config
     SUPERSET_HOME = {envtmpdir}
-    py36-mysql: SUPERSET__SQLALCHEMY_DATABASE_URI = mysql://mysqluser:mysqluserpassword@localhost/superset?charset=utf8
-    py36-postgres: SUPERSET__SQLALCHEMY_DATABASE_URI = postgresql+psycopg2://superset:superset@localhost/test
-    py36-sqlite: SUPERSET__SQLALCHEMY_DATABASE_URI = sqlite:////{envtmpdir}/superset.db
+    mysql: SUPERSET__SQLALCHEMY_DATABASE_URI = mysql://mysqluser:mysqluserpassword@localhost/superset?charset=utf8
+    postgres: SUPERSET__SQLALCHEMY_DATABASE_URI = postgresql+psycopg2://superset:superset@localhost/test
+    sqlite: SUPERSET__SQLALCHEMY_DATABASE_URI = sqlite:////{envtmpdir}/superset.db
 whitelist_externals =
     npm
 
@@ -137,18 +139,6 @@ commands =
 deps =
     -rrequirements-dev.txt
 
-[testenv:py36-mysql]
-deps =
-    -rrequirements.txt
-    -rrequirements-dev.txt
-    .[mysql]
-
-[testenv:py36-postgres]
-deps =
-    -rrequirements.txt
-    -rrequirements-dev.txt
-    .[postgres]
-
 [testenv:pylint]
 commands =
     pylint superset