diff --git a/bindep.txt b/bindep.txt
new file mode 100644
index 000000000..3ffe69f3f
--- /dev/null
+++ b/bindep.txt
@@ -0,0 +1,10 @@
+# This is a cross-platform list tracking distribution packages needed for install and tests;
+# see https://docs.openstack.org/infra/bindep/ for additional information.
+
+libffi-dev [platform:dpkg]
+libldap2-dev [platform:dpkg]
+libxml2-dev [platform:dpkg]
+libxslt1-dev [platform:dpkg]
+libsasl2-dev [platform:dpkg]
+libffi-devel [platform:rpm]
+python3-all-dev [platform:dpkg]
diff --git a/tox.ini b/tox.ini
index 0ffd6fdb0..b191ced6b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipsdist = True
 
 [testenv]
 install_command = pip install -v -v -v \
-    -c https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
     {opts} {packages}
 setenv =
     VIRTUAL_ENV={envdir}