diff --git a/tox.ini b/tox.ini
index 34354d028..776178be9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,46 +65,38 @@ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,to
 import_exceptions = neutron.i18n
 local-check-factory = neutron.hacking.checks.factory
 
-# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
-# local env, like this:
-#
+# If you are running the tests locally you should set the env variable
 # TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
-#
 [testenv:apiv1]
 sitepackages = True
+passenv = TEMPEST_CONFIG_DIR
 setenv =
  OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v1/api
  OS_TESTR_CONCURRENCY=1
 
-# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
-# local env, like this:
-#
+# If you are running the tests locally you should set the env variable
 # TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
-#
 [testenv:apiv2]
 sitepackages = True
+passenv = TEMPEST_CONFIG_DIR
 setenv =
  OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/api
  OS_TESTR_CONCURRENCY=1
 
-# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
-# local env, like this:
-#
+# If you are running the tests locally you should set the env variable
 # TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
-#
 [testenv:scenario]
 sitepackages = True
+passenv = TEMPEST_CONFIG_DIR
 setenv =
  OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/scenario
  OS_TESTR_CONCURRENCY=1
 
-# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
-# local env, like this:
-#
+# If you are running the tests locally you should set the env variable
 # TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
-#
 [testenv:ddt]
 sitepackages = True
+passenv = TEMPEST_CONFIG_DIR
 setenv =
  OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/ddt
  OS_TESTR_CONCURRENCY=1