diff --git a/tox.ini b/tox.ini
index 76bb5dd70..448c2989f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,7 @@ install_command = pip install -U {opts} {packages}
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
          EVENTLET_NO_GREENDNS=yes
+passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
 commands =
    bash -x {toxinidir}/setup-test-env-mongodb.sh python setup.py testr --slowest --testr-args="{posargs}"
    bash -x {toxinidir}/setup-test-env-mysql.sh python setup.py testr --slowest --testr-args="{posargs}"
@@ -38,7 +39,7 @@ setenv = VIRTUAL_ENV={envdir}
          EVENTLET_NO_GREENDNS=yes
          OS_TEST_PATH=aodh/tests/functional/
          GABBI_LIVE_FAIL_IF_NO_TEST=1
-passenv = AODH_*
+passenv = {[testenv]passenv} AODH_*
 commands =
    bash -x {toxinidir}/run-functional-tests.sh "{posargs}"