diff --git a/active_directory/tox.ini b/active_directory/tox.ini
index a07f19c21fde8..1fd68b55e53ea 100644
--- a/active_directory/tox.ini
+++ b/active_directory/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = win32
diff --git a/activemq/tox.ini b/activemq/tox.ini
index 0c9415cfae18a..399fa495ac460 100644
--- a/activemq/tox.ini
+++ b/activemq/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 usedevelop = true
diff --git a/activemq_xml/tox.ini b/activemq_xml/tox.ini
index 006b7b3816122..8c370229af79d 100644
--- a/activemq_xml/tox.ini
+++ b/activemq_xml/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 usedevelop = true
diff --git a/aerospike/tox.ini b/aerospike/tox.ini
index d510660ac4ae4..b40dc7aa1f436 100644
--- a/aerospike/tox.ini
+++ b/aerospike/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{latest}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/airflow/tox.ini b/airflow/tox.ini
index 84758702ffc3e..d25f7f1e298dd 100644
--- a/airflow/tox.ini
+++ b/airflow/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
    py{27,38}: e2e ready
 dd_check_style = true
diff --git a/amazon_msk/tox.ini b/amazon_msk/tox.ini
index e69719f5e77b1..7339fadd73c7e 100644
--- a/amazon_msk/tox.ini
+++ b/amazon_msk/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/ambari/tox.ini b/ambari/tox.ini
index e69719f5e77b1..7339fadd73c7e 100644
--- a/ambari/tox.ini
+++ b/ambari/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/apache/tox.ini b/apache/tox.ini
index 27cedc7bea315..fb7fcd55a27df 100644
--- a/apache/tox.ini
+++ b/apache/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 usedevelop = true
diff --git a/aspdotnet/tox.ini b/aspdotnet/tox.ini
index a07f19c21fde8..1fd68b55e53ea 100644
--- a/aspdotnet/tox.ini
+++ b/aspdotnet/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = win32
diff --git a/btrfs/tox.ini b/btrfs/tox.ini
index 96f2a59fe0266..239683f9db5bb 100644
--- a/btrfs/tox.ini
+++ b/btrfs/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 usedevelop = true
 dd_check_style = true
 platform = linux|darwin
diff --git a/cacti/tox.ini b/cacti/tox.ini
index 79acff1a6b5e1..659533ed6e380 100644
--- a/cacti/tox.ini
+++ b/cacti/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 usedevelop = true
diff --git a/cassandra/tox.ini b/cassandra/tox.ini
index ed9b737105a45..d83873e3b954d 100644
--- a/cassandra/tox.ini
+++ b/cassandra/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 usedevelop = true
diff --git a/cassandra_nodetool/tox.ini b/cassandra_nodetool/tox.ini
index 276c102ae0e1c..a44d46f956385 100644
--- a/cassandra_nodetool/tox.ini
+++ b/cassandra_nodetool/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{2.1,3.0}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/ceph/tox.ini b/ceph/tox.ini
index a9ecedc594201..15d622e068cc2 100644
--- a/ceph/tox.ini
+++ b/ceph/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/cilium/tox.ini b/cilium/tox.ini
index c2b36fdc25489..bfe6eebf8e2df 100644
--- a/cilium/tox.ini
+++ b/cilium/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/cisco_aci/tox.ini b/cisco_aci/tox.ini
index 772e654a86710..82836ff30eec9 100644
--- a/cisco_aci/tox.ini
+++ b/cisco_aci/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 usedevelop = true
 dd_check_style = true
 deps =
diff --git a/clickhouse/tox.ini b/clickhouse/tox.ini
index 4331177eb3fab..0a36a3c7359e7 100644
--- a/clickhouse/tox.ini
+++ b/clickhouse/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{18,19,latest}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/cockroachdb/tox.ini b/cockroachdb/tox.ini
index dc70209364da5..910a7ebd46e25 100644
--- a/cockroachdb/tox.ini
+++ b/cockroachdb/tox.ini
@@ -7,6 +7,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/confluent_platform/tox.ini b/confluent_platform/tox.ini
index 96e5079aa0a66..186f4dec2548b 100644
--- a/confluent_platform/tox.ini
+++ b/confluent_platform/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 dd_check_style = true
diff --git a/consul/tox.ini b/consul/tox.ini
index 0188c245c96ab..fb8d2e2497046 100644
--- a/consul/tox.ini
+++ b/consul/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{0.6.4,0.7.2,1.0.0,1.0.6}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/coredns/tox.ini b/coredns/tox.ini
index f188419b7511f..4dd7cccc7e088 100644
--- a/coredns/tox.ini
+++ b/coredns/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{1.2.0}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}-{1.2.0}: e2e ready 
diff --git a/couch/tox.ini b/couch/tox.ini
index 47c0b61503dae..4afd13aad6527 100644
--- a/couch/tox.ini
+++ b/couch/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{1.6,2.3}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/couchbase/tox.ini b/couchbase/tox.ini
index 67abeeb165e64..93e81e42c3b81 100644
--- a/couchbase/tox.ini
+++ b/couchbase/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{5.5.3}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/crio/tox.ini b/crio/tox.ini
index a79cf88dc05b4..06a0f9cd3da42 100644
--- a/crio/tox.ini
+++ b/crio/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/datadog_checks_base/tox.ini b/datadog_checks_base/tox.ini
index 3a31fd69e6018..b31d833b5b150 100644
--- a/datadog_checks_base/tox.ini
+++ b/datadog_checks_base/tox.ini
@@ -6,6 +6,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 dd_check_types = true
 dd_mypy_args =
diff --git a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py
index b3ae45cc8bb34..185410b7fe048 100644
--- a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py
+++ b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py
@@ -14,6 +14,7 @@
 TYPES_FLAG = 'dd_check_types'
 MYPY_ARGS_OPTION = 'dd_mypy_args'
 E2E_READY_CONDITION = 'e2e ready if'
+FIX_DEFAULT_ENVDIR_FLAG = 'ensure_default_envdir'
 
 
 @tox.hookimpl
@@ -23,11 +24,12 @@ def tox_configure(config):
     For an example, see: https://github.com/tox-dev/tox-travis
     """
     sections = config._cfg.sections
+    base_testenv = sections.get('testenv', {})
 
     # Default to false so:
     # 1. we don't affect other projects using tox
     # 2. check migrations can happen gradually
-    if str(sections.get('testenv', {}).get(STYLE_FLAG, 'false')).lower() == 'true':
+    if str(base_testenv.get(STYLE_FLAG, 'false')).lower() == 'true':
         # Disable flake8 since we already include that
         config.envlist[:] = [env for env in config.envlist if not env.endswith('flake8')]
 
@@ -37,8 +39,16 @@ def tox_configure(config):
         add_style_checker(config, sections, make_envconfig, reader)
         add_style_formatter(config, sections, make_envconfig, reader)
 
+    # Workaround for https://github.com/tox-dev/tox/issues/1593
+    #
+    # Do this only after all dynamic environments have been created
+    if str(base_testenv.get(FIX_DEFAULT_ENVDIR_FLAG, 'false')).lower() == 'true':
+        for env_name, env_config in config.envconfigs.items():
+            if env_config.envdir == config.toxinidir:
+                env_config.envdir = config.toxworkdir / env_name
+
     # Conditionally set 'e2e ready' depending on env variables
-    description = sections.get('testenv', {}).get('description')
+    description = base_testenv.get('description')
     if description and E2E_READY_CONDITION in description:
         data, var = description.split(' if ')
         if var in os.environ:
diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/tox.ini b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/tox.ini
index 10312622bd1f9..8fd2fe7a80f30 100644
--- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/tox.ini
+++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{{27,38}}
 
 [testenv]
+ensure_correct_envdir = true
+envdir =
+    py27: {{toxworkdir}}/py27
+    py38: {{toxworkdir}}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/datadog_checks_dev/tox.ini b/datadog_checks_dev/tox.ini
index 38fdab88c8eba..d93cd062f239d 100644
--- a/datadog_checks_dev/tox.ini
+++ b/datadog_checks_dev/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 dd_check_types = true
 dd_mypy_args =
diff --git a/datadog_checks_downloader/tox.ini b/datadog_checks_downloader/tox.ini
index 89137091eb456..d7b6d1559fac4 100644
--- a/datadog_checks_downloader/tox.ini
+++ b/datadog_checks_downloader/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 deps =
diff --git a/directory/tox.ini b/directory/tox.ini
index 46b6bd82e6438..0c07856fef348 100644
--- a/directory/tox.ini
+++ b/directory/tox.ini
@@ -7,6 +7,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description=
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/disk/tox.ini b/disk/tox.ini
index 25a99a44993a4..a06c1c480d4d4 100644
--- a/disk/tox.ini
+++ b/disk/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/dns_check/tox.ini b/dns_check/tox.ini
index 8e3354fb4724e..7768307ba747a 100644
--- a/dns_check/tox.ini
+++ b/dns_check/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description=
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/dotnetclr/tox.ini b/dotnetclr/tox.ini
index a07f19c21fde8..1fd68b55e53ea 100644
--- a/dotnetclr/tox.ini
+++ b/dotnetclr/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = win32
diff --git a/druid/tox.ini b/druid/tox.ini
index 84758702ffc3e..d25f7f1e298dd 100644
--- a/druid/tox.ini
+++ b/druid/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
    py{27,38}: e2e ready
 dd_check_style = true
diff --git a/ecs_fargate/tox.ini b/ecs_fargate/tox.ini
index 091f2de7ce566..8f141a2ac9b77 100644
--- a/ecs_fargate/tox.ini
+++ b/ecs_fargate/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/eks_fargate/tox.ini b/eks_fargate/tox.ini
index e69719f5e77b1..7339fadd73c7e 100644
--- a/eks_fargate/tox.ini
+++ b/eks_fargate/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/elastic/tox.ini b/elastic/tox.ini
index 6fb4ceed35cb4..094b1db1af2a8 100644
--- a/elastic/tox.ini
+++ b/elastic/tox.ini
@@ -9,6 +9,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/envoy/tox.ini b/envoy/tox.ini
index 831e7d5ff5bec..2da34178d39ad 100644
--- a/envoy/tox.ini
+++ b/envoy/tox.ini
@@ -7,6 +7,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/etcd/tox.ini b/etcd/tox.ini
index 9158d416622de..34ca81dacb0d8 100644
--- a/etcd/tox.ini
+++ b/etcd/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{3.3.8,3.3.9,3.3.10}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/exchange_server/tox.ini b/exchange_server/tox.ini
index a07f19c21fde8..1fd68b55e53ea 100644
--- a/exchange_server/tox.ini
+++ b/exchange_server/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = win32
diff --git a/external_dns/tox.ini b/external_dns/tox.ini
index 4c0f31b4534c7..4f0976f3f3839 100644
--- a/external_dns/tox.ini
+++ b/external_dns/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/fluentd/tox.ini b/fluentd/tox.ini
index be4dfdca4af61..72ad9b2c329bb 100644
--- a/fluentd/tox.ini
+++ b/fluentd/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{0.12.23,1.9}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description=
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/gearmand/tox.ini b/gearmand/tox.ini
index 2db2e6a3ae528..675251c6c9977 100644
--- a/gearmand/tox.ini
+++ b/gearmand/tox.ini
@@ -5,6 +5,10 @@ envlist =
   py{27,38}-{1.0.6,1.1.18}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description=
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/gitlab/tox.ini b/gitlab/tox.ini
index 2b5acd0537888..252965d46fceb 100644
--- a/gitlab/tox.ini
+++ b/gitlab/tox.ini
@@ -6,6 +6,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description=
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/gitlab_runner/tox.ini b/gitlab_runner/tox.ini
index ecc42d9756182..cbb268f3bbfa2 100644
--- a/gitlab_runner/tox.ini
+++ b/gitlab_runner/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-10.8.0
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description=
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/go_expvar/tox.ini b/go_expvar/tox.ini
index 6b4e9ef16bbee..fc6b64565bbe5 100644
--- a/go_expvar/tox.ini
+++ b/go_expvar/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/gunicorn/tox.ini b/gunicorn/tox.ini
index 73af6665f22ef..1d3f7a5642e80 100644
--- a/gunicorn/tox.ini
+++ b/gunicorn/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{19.2,19.9,latest}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/haproxy/tox.ini b/haproxy/tox.ini
index 06e63c5649705..dd57cd55e0810 100644
--- a/haproxy/tox.ini
+++ b/haproxy/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{14,15,16,17,18,20,21}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/harbor/tox.ini b/harbor/tox.ini
index 3c73b850629ba..d2c610d4e8452 100644
--- a/harbor/tox.ini
+++ b/harbor/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{1.4,1.5,1.6,1.7,1.8,1.10}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/hazelcast/tox.ini b/hazelcast/tox.ini
index ca3ed11cadb2a..8e407d5989db8 100644
--- a/hazelcast/tox.ini
+++ b/hazelcast/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38-{4.0,latest}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 usedevelop = true
diff --git a/hdfs_datanode/tox.ini b/hdfs_datanode/tox.ini
index 1a8a83db4ceea..67b13a8f17247 100644
--- a/hdfs_datanode/tox.ini
+++ b/hdfs_datanode/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-2.7.1
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/hdfs_namenode/tox.ini b/hdfs_namenode/tox.ini
index 1a8a83db4ceea..67b13a8f17247 100644
--- a/hdfs_namenode/tox.ini
+++ b/hdfs_namenode/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-2.7.1
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/hive/tox.ini b/hive/tox.ini
index ed9b737105a45..d83873e3b954d 100644
--- a/hive/tox.ini
+++ b/hive/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 usedevelop = true
diff --git a/hivemq/tox.ini b/hivemq/tox.ini
index 3b03271c7614b..9e22a80da2e80 100644
--- a/hivemq/tox.ini
+++ b/hivemq/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38-{4.3}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 dd_check_style = true
diff --git a/http_check/tox.ini b/http_check/tox.ini
index 25a99a44993a4..a06c1c480d4d4 100644
--- a/http_check/tox.ini
+++ b/http_check/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/hyperv/tox.ini b/hyperv/tox.ini
index c453e82547a7d..52f5969571fa4 100644
--- a/hyperv/tox.ini
+++ b/hyperv/tox.ini
@@ -7,6 +7,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/ibm_db2/tox.ini b/ibm_db2/tox.ini
index 7be096729d65b..60c713515e877 100644
--- a/ibm_db2/tox.ini
+++ b/ibm_db2/tox.ini
@@ -7,6 +7,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/ibm_mq/tox.ini b/ibm_mq/tox.ini
index b9057fb1cda0a..1a51deb59240b 100644
--- a/ibm_mq/tox.ini
+++ b/ibm_mq/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{8,9}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description=
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/ibm_was/tox.ini b/ibm_was/tox.ini
index 7b9fff8edbb0f..c4b8ae75fa7ec 100644
--- a/ibm_was/tox.ini
+++ b/ibm_was/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{9}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description=
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/ignite/tox.ini b/ignite/tox.ini
index ed9b737105a45..d83873e3b954d 100644
--- a/ignite/tox.ini
+++ b/ignite/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 usedevelop = true
diff --git a/iis/tox.ini b/iis/tox.ini
index a07f19c21fde8..1fd68b55e53ea 100644
--- a/iis/tox.ini
+++ b/iis/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = win32
diff --git a/istio/tox.ini b/istio/tox.ini
index 1ff6725a92efe..8ad0411a0aada 100644
--- a/istio/tox.ini
+++ b/istio/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{1.2,1.5}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
    py{27,38}: e2e ready if TF_VAR_account_json
 dd_check_style = true
diff --git a/jboss_wildfly/tox.ini b/jboss_wildfly/tox.ini
index ed9b737105a45..d83873e3b954d 100644
--- a/jboss_wildfly/tox.ini
+++ b/jboss_wildfly/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 usedevelop = true
diff --git a/kafka/tox.ini b/kafka/tox.ini
index dfe82f84416cb..c16719660c81f 100644
--- a/kafka/tox.ini
+++ b/kafka/tox.ini
@@ -5,6 +5,9 @@ envlist =
     py38
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 dd_check_style = true
diff --git a/kafka_consumer/tox.ini b/kafka_consumer/tox.ini
index f0b63aad85836..47796bdce66ee 100644
--- a/kafka_consumer/tox.ini
+++ b/kafka_consumer/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py38-{0.9,0.11,1.1,2.3,latest}-{kafka,zk}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/kong/tox.ini b/kong/tox.ini
index 414fac829b529..ef96ffe4ff09f 100644
--- a/kong/tox.ini
+++ b/kong/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{1.5}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/kube_apiserver_metrics/tox.ini b/kube_apiserver_metrics/tox.ini
index e69719f5e77b1..7339fadd73c7e 100644
--- a/kube_apiserver_metrics/tox.ini
+++ b/kube_apiserver_metrics/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/kube_controller_manager/tox.ini b/kube_controller_manager/tox.ini
index cfa56d04bcde8..67ca7fa6fc914 100644
--- a/kube_controller_manager/tox.ini
+++ b/kube_controller_manager/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/kube_dns/tox.ini b/kube_dns/tox.ini
index 091f2de7ce566..8f141a2ac9b77 100644
--- a/kube_dns/tox.ini
+++ b/kube_dns/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/kube_metrics_server/tox.ini b/kube_metrics_server/tox.ini
index e69719f5e77b1..7339fadd73c7e 100644
--- a/kube_metrics_server/tox.ini
+++ b/kube_metrics_server/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/kube_proxy/tox.ini b/kube_proxy/tox.ini
index 708727c700469..1785ccf822268 100644
--- a/kube_proxy/tox.ini
+++ b/kube_proxy/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin
diff --git a/kube_scheduler/tox.ini b/kube_scheduler/tox.ini
index 26a7522226a4b..0d952f291ef10 100644
--- a/kube_scheduler/tox.ini
+++ b/kube_scheduler/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/kubelet/tox.ini b/kubelet/tox.ini
index 708727c700469..1785ccf822268 100644
--- a/kubelet/tox.ini
+++ b/kubelet/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin
diff --git a/kubernetes_state/tox.ini b/kubernetes_state/tox.ini
index 091f2de7ce566..8f141a2ac9b77 100644
--- a/kubernetes_state/tox.ini
+++ b/kubernetes_state/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/kyototycoon/tox.ini b/kyototycoon/tox.ini
index fb634e5c4f15c..12c15cc41d9c7 100644
--- a/kyototycoon/tox.ini
+++ b/kyototycoon/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/lighttpd/tox.ini b/lighttpd/tox.ini
index 0d7dd3912bbda..378099ec54949 100644
--- a/lighttpd/tox.ini
+++ b/lighttpd/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{auth,noauth}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/linkerd/tox.ini b/linkerd/tox.ini
index eed29526dd88f..fffab53f30f92 100644
--- a/linkerd/tox.ini
+++ b/linkerd/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
    py{27,38}: e2e ready if TF_VAR_account_json
diff --git a/linux_proc_extras/tox.ini b/linux_proc_extras/tox.ini
index 9066a6e839b87..7cf2f0bfa734b 100644
--- a/linux_proc_extras/tox.ini
+++ b/linux_proc_extras/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/mapr/tox.ini b/mapr/tox.ini
index e69719f5e77b1..7339fadd73c7e 100644
--- a/mapr/tox.ini
+++ b/mapr/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/mapreduce/tox.ini b/mapreduce/tox.ini
index 4d6365c536753..e0bb94ab2605e 100644
--- a/mapreduce/tox.ini
+++ b/mapreduce/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/marathon/tox.ini b/marathon/tox.ini
index 68eb7e8f6a6d1..faa1e4eec6fe8 100644
--- a/marathon/tox.ini
+++ b/marathon/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/mcache/tox.ini b/mcache/tox.ini
index b699f67f2d775..1417b1e6cddff 100644
--- a/mcache/tox.ini
+++ b/mcache/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/mesos_master/tox.ini b/mesos_master/tox.ini
index 7aeda9d31d789..7f61349ec4659 100644
--- a/mesos_master/tox.ini
+++ b/mesos_master/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{1.0,1.1}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/mesos_slave/tox.ini b/mesos_slave/tox.ini
index 546abf0099fda..19741ee5dd706 100644
--- a/mesos_slave/tox.ini
+++ b/mesos_slave/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{1.0,1.1,1.7}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/mongo/tox.ini b/mongo/tox.ini
index 8ebbff7c95f12..41ca97ce5cc06 100644
--- a/mongo/tox.ini
+++ b/mongo/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{3.2.10,3.4,3.5,4.1}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/mysql/tox.ini b/mysql/tox.ini
index c9a043645bf96..a06d86cccd692 100644
--- a/mysql/tox.ini
+++ b/mysql/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{5.6,5.7,8.0,maria}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/nagios/tox.ini b/nagios/tox.ini
index 68eb7e8f6a6d1..faa1e4eec6fe8 100644
--- a/nagios/tox.ini
+++ b/nagios/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/network/tox.ini b/network/tox.ini
index 4d6365c536753..e0bb94ab2605e 100644
--- a/network/tox.ini
+++ b/network/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/nfsstat/tox.ini b/nfsstat/tox.ini
index 25a99a44993a4..a06c1c480d4d4 100644
--- a/nfsstat/tox.ini
+++ b/nfsstat/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/nginx/tox.ini b/nginx/tox.ini
index b88917297e649..11aae6bb5b27b 100644
--- a/nginx/tox.ini
+++ b/nginx/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{1.12,1.13,vts}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description=
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/nginx_ingress_controller/tox.ini b/nginx_ingress_controller/tox.ini
index dbd8efa0da187..368f6d9bb747d 100644
--- a/nginx_ingress_controller/tox.ini
+++ b/nginx_ingress_controller/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 platform = linux|darwin|win32
 deps =
diff --git a/openldap/tox.ini b/openldap/tox.ini
index d6f70a291dec6..ed6044a1a04a6 100644
--- a/openldap/tox.ini
+++ b/openldap/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{2.4}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/openmetrics/tox.ini b/openmetrics/tox.ini
index 330dbf718b4a1..4adee6ce47cef 100644
--- a/openmetrics/tox.ini
+++ b/openmetrics/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/openstack/tox.ini b/openstack/tox.ini
index 091f2de7ce566..8f141a2ac9b77 100644
--- a/openstack/tox.ini
+++ b/openstack/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/openstack_controller/tox.ini b/openstack_controller/tox.ini
index 36279517333ad..a3c1b52fe673b 100644
--- a/openstack_controller/tox.ini
+++ b/openstack_controller/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description = 
    py{27,38}: e2e ready if TF_VAR_account_json
 dd_check_style = true
diff --git a/oracle/tox.ini b/oracle/tox.ini
index 564b6771bb8c3..43ff3082781ec 100644
--- a/oracle/tox.ini
+++ b/oracle/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{12.2}-{oracle,jdbc}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
    py{27,38}: e2e ready
 dd_check_style = true
diff --git a/pdh_check/tox.ini b/pdh_check/tox.ini
index 95caef3d4333f..0aa743db0def0 100644
--- a/pdh_check/tox.ini
+++ b/pdh_check/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/pgbouncer/tox.ini b/pgbouncer/tox.ini
index 8338f304b6ccb..ef44f5af63238 100644
--- a/pgbouncer/tox.ini
+++ b/pgbouncer/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{1.7,1.8,1.12}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/php_fpm/tox.ini b/php_fpm/tox.ini
index 6e9e2b20acd8e..8a60c7430532f 100644
--- a/php_fpm/tox.ini
+++ b/php_fpm/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/postfix/tox.ini b/postfix/tox.ini
index 2b1c9047a1e43..f0602d8263535 100644
--- a/postfix/tox.ini
+++ b/postfix/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/postgres/tox.ini b/postgres/tox.ini
index 12f1a1403b839..dcb0b64c3403b 100644
--- a/postgres/tox.ini
+++ b/postgres/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{93,94,95,96,10,11}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/powerdns_recursor/tox.ini b/powerdns_recursor/tox.ini
index 5515ae032056d..8bd77e0f3a1ce 100644
--- a/powerdns_recursor/tox.ini
+++ b/powerdns_recursor/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{3.7.3,4.0.9}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/presto/tox.ini b/presto/tox.ini
index ce43845225569..ca6f5ab9ab4e0 100644
--- a/presto/tox.ini
+++ b/presto/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py38: e2e ready
diff --git a/process/tox.ini b/process/tox.ini
index 2632223bcc6af..5a2048a8eb76d 100644
--- a/process/tox.ini
+++ b/process/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/prometheus/tox.ini b/prometheus/tox.ini
index 98e780fc9d424..3abacdbe3e3a0 100644
--- a/prometheus/tox.ini
+++ b/prometheus/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description:
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/proxysql/tox.ini b/proxysql/tox.ini
index a233094acab71..1813a37dffe66 100644
--- a/proxysql/tox.ini
+++ b/proxysql/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{1,2}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/rabbitmq/tox.ini b/rabbitmq/tox.ini
index c133f128e5173..f83248d0b40ae 100644
--- a/rabbitmq/tox.ini
+++ b/rabbitmq/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{3.5,3.6,3.7}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/redisdb/tox.ini b/redisdb/tox.ini
index 9753102bf58e9..6fa3dd2007647 100644
--- a/redisdb/tox.ini
+++ b/redisdb/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{3.2,4.0,6.0,latest}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/rethinkdb/tox.ini b/rethinkdb/tox.ini
index 383fc0ceefe8d..edd34547cce3e 100644
--- a/rethinkdb/tox.ini
+++ b/rethinkdb/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{2.3,latest}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 dd_check_types = true
 dd_mypy_args = --py2 --disallow-untyped-defs datadog_checks/ tests/
diff --git a/riak/tox.ini b/riak/tox.ini
index fb634e5c4f15c..12c15cc41d9c7 100644
--- a/riak/tox.ini
+++ b/riak/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/riakcs/tox.ini b/riakcs/tox.ini
index f0b151e6baaaa..b50ac5a8146ee 100644
--- a/riakcs/tox.ini
+++ b/riakcs/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/sap_hana/tox.ini b/sap_hana/tox.ini
index e334eed46e7c0..21fec2f1e653b 100644
--- a/sap_hana/tox.ini
+++ b/sap_hana/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-2
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/scylla/tox.ini b/scylla/tox.ini
index 92ac67521e32c..250b3a6871bd7 100644
--- a/scylla/tox.ini
+++ b/scylla/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{3.1,3.2,3.3}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/snmp/tox.ini b/snmp/tox.ini
index 99c6fb3fae7d9..205aeff29aa09 100644
--- a/snmp/tox.ini
+++ b/snmp/tox.ini
@@ -6,6 +6,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/solr/tox.ini b/solr/tox.ini
index 0663fe37475f8..9ef6fc61f6702 100644
--- a/solr/tox.ini
+++ b/solr/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38-{6.6,7.7,8.5}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 usedevelop = true
diff --git a/spark/tox.ini b/spark/tox.ini
index 70332139336d5..3e1065f1a3ecb 100644
--- a/spark/tox.ini
+++ b/spark/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{2.4}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/sqlserver/tox.ini b/sqlserver/tox.ini
index 2bda1eacc6737..d61684448a8c2 100644
--- a/sqlserver/tox.ini
+++ b/sqlserver/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/squid/tox.ini b/squid/tox.ini
index a2dcb651e46b3..39a085f07925d 100644
--- a/squid/tox.ini
+++ b/squid/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{latest}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/ssh_check/tox.ini b/ssh_check/tox.ini
index 1bad8288e78b7..d8afcc7396e7a 100644
--- a/ssh_check/tox.ini
+++ b/ssh_check/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{8.1-latest}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/statsd/tox.ini b/statsd/tox.ini
index 204b9fd547489..61bfcceb22d37 100644
--- a/statsd/tox.ini
+++ b/statsd/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/supervisord/tox.ini b/supervisord/tox.ini
index 56d99cf805296..e224e5283ba34 100644
--- a/supervisord/tox.ini
+++ b/supervisord/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{3.3}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 usedevelop = true
diff --git a/system_core/tox.ini b/system_core/tox.ini
index 25a99a44993a4..a06c1c480d4d4 100644
--- a/system_core/tox.ini
+++ b/system_core/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/system_swap/tox.ini b/system_swap/tox.ini
index fb634e5c4f15c..12c15cc41d9c7 100644
--- a/system_swap/tox.ini
+++ b/system_swap/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/tcp_check/tox.ini b/tcp_check/tox.ini
index 25a99a44993a4..a06c1c480d4d4 100644
--- a/tcp_check/tox.ini
+++ b/tcp_check/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/teamcity/tox.ini b/teamcity/tox.ini
index 091f2de7ce566..8f141a2ac9b77 100644
--- a/teamcity/tox.ini
+++ b/teamcity/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/tls/tox.ini b/tls/tox.ini
index a4b01c53d2939..0156aa16f58e2 100644
--- a/tls/tox.ini
+++ b/tls/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/tokumx/tox.ini b/tokumx/tox.ini
index 3533ba28cf87f..60207bf239e25 100644
--- a/tokumx/tox.ini
+++ b/tokumx/tox.ini
@@ -5,6 +5,9 @@ envlist =
     py27
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
 description =
     py27: e2e ready
 dd_check_style = true
diff --git a/tomcat/tox.ini b/tomcat/tox.ini
index ed9b737105a45..d83873e3b954d 100644
--- a/tomcat/tox.ini
+++ b/tomcat/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 usedevelop = true
diff --git a/twemproxy/tox.ini b/twemproxy/tox.ini
index 5cf5116fb5487..f8f92e5020bd0 100644
--- a/twemproxy/tox.ini
+++ b/twemproxy/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py27,py37: e2e ready
 dd_check_style = true
diff --git a/twistlock/tox.ini b/twistlock/tox.ini
index e69719f5e77b1..7339fadd73c7e 100644
--- a/twistlock/tox.ini
+++ b/twistlock/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32
diff --git a/varnish/tox.ini b/varnish/tox.ini
index 9c0bd31f327ad..d0007cc5ef3a7 100644
--- a/varnish/tox.ini
+++ b/varnish/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{417,521}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/vault/tox.ini b/vault/tox.ini
index 97ae9605cd78b..4da503005ae57 100644
--- a/vault/tox.ini
+++ b/vault/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{token-auth,noauth}
     bench
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/vertica/tox.ini b/vertica/tox.ini
index f3fe165a9e3b0..acfd6ee5d7cba 100644
--- a/vertica/tox.ini
+++ b/vertica/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-9
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/vsphere/tox.ini b/vsphere/tox.ini
index df27a839dbaf6..ede28a71e339e 100644
--- a/vsphere/tox.ini
+++ b/vsphere/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 dd_check_types = true
 dd_mypy_args =
diff --git a/win32_event_log/tox.ini b/win32_event_log/tox.ini
index c7ede4a7d724b..b7d2461ab1fce 100644
--- a/win32_event_log/tox.ini
+++ b/win32_event_log/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = win32
diff --git a/windows_service/tox.ini b/windows_service/tox.ini
index e6ee04864f83b..326c38729b1ee 100644
--- a/windows_service/tox.ini
+++ b/windows_service/tox.ini
@@ -7,6 +7,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready
diff --git a/wmi_check/tox.ini b/wmi_check/tox.ini
index 73a32bad3eddf..6121a7f497d16 100644
--- a/wmi_check/tox.ini
+++ b/wmi_check/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = win32
diff --git a/yarn/tox.ini b/yarn/tox.ini
index 3fcad44737346..8ad4189e4f44c 100644
--- a/yarn/tox.ini
+++ b/yarn/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true
diff --git a/zk/tox.ini b/zk/tox.ini
index 4244542f0084f..c79c5ce9d36ea 100644
--- a/zk/tox.ini
+++ b/zk/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{3.4,3.5,3.6}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true