diff --git a/.stestr.conf b/.stestr.conf
index 0d94bfb92d..fdff752c61 100644
--- a/.stestr.conf
+++ b/.stestr.conf
@@ -1,3 +1,3 @@
 [DEFAULT]
-test_path=${TEST_PATH:-./heat/tests}
+test_path=${OS_TEST_PATH:-./heat/tests}
 top_dir=./
diff --git a/tox.ini b/tox.ini
index 4525b83f67..c83086222b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,6 @@ minversion = 3.18.0
 [testenv]
 basepython = python3
 setenv =
-  OS_TEST_PATH=heat/tests
   PYTHONDONTWRITEBYTECODE=1
 usedevelop = True
 deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}