diff --git a/constraints.txt b/constraints.txt
new file mode 100644
index 000000000..47a7105fb
--- /dev/null
+++ b/constraints.txt
@@ -0,0 +1 @@
+-e git+https://github.com/openstack/tripleo-common@master#egg=tripleo-common
diff --git a/molecule-requirements.txt b/molecule-requirements.txt
index 88c67dd3b..8c8d176c6 100644
--- a/molecule-requirements.txt
+++ b/molecule-requirements.txt
@@ -22,3 +22,6 @@ doc8>=0.8.0 # Apache-2.0
 bashate>=0.6.0 # Apache-2.0
 metalsmith>=0.13.0 # Apache-2.0
 jsonschema  # MIT
+
+# Upstream requirements from constraints.txt
+tripleo-common
diff --git a/tox.ini b/tox.ini
index 6a5058f90..f4e29997d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,7 +61,9 @@ commands =
 
 [testenv:releasenotes]
 basepython = python3
-deps = -r{toxinidir}/doc/requirements.txt
+deps =
+  -r {toxinidir}/doc/requirements.txt
+  -c {toxinidir}/constraints.txt
 commands =
     sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
 
@@ -69,6 +71,7 @@ commands =
 basepython = python3
 deps =
   -r {toxinidir}/doc/requirements.txt
+  -c {toxinidir}/constraints.txt
 commands=
     doc8 doc
     sphinx-build -a -E -W -d doc/build/doctrees --keep-going -b html doc/source doc/build/html -T