diff --git a/.testr.conf b/.testr.conf
index 1bdd94e50e..044f5a32a0 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,7 +1,8 @@
 [DEFAULT]
 test_command=
     PYTHON=$(echo ${PYTHON:-python} | sed 's/--source heat//g')
-    ${PYTHON} -m subunit.run discover -s . $LISTOPT $IDOPTION
-    for plugin in contrib/*; do ${PYTHON} -m subunit.run discover -s $plugin $LISTOPT $IDOPTION; done
+    START_AT=${TESTR_START_DIR:-.}
+    ${PYTHON} -m subunit.run discover -s $START_AT -t . $LISTOPT $IDOPTION
+    if [ "$START_AT" = "." ]; then for plugin in $START_AT/contrib/*; do ${PYTHON} -m subunit.run discover -s $plugin $LISTOPT $IDOPTION; done; fi
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/heat_integrationtests/requirements.txt b/heat_integrationtests/requirements.txt
new file mode 100644
index 0000000000..2f08f9a190
--- /dev/null
+++ b/heat_integrationtests/requirements.txt
@@ -0,0 +1,18 @@
+kombu>=2.5.0
+oslo.log>=1.0.0,<1.1.0  # Apache-2.0
+oslo.messaging>=1.8.0,<1.9.0  # Apache-2.0
+oslo.config>=1.9.3,<1.10.0  # Apache-2.0
+oslo.utils>=1.4.0,<1.5.0  # Apache-2.0
+paramiko>=1.13.0
+python-cinderclient>=1.1.0
+python-keystoneclient>=1.1.0
+python-heatclient>=0.3.0
+python-neutronclient>=2.3.11,<3
+python-novaclient>=2.22.0
+python-swiftclient>=2.2.0
+PyYAML>=3.1.0
+requests>=2.2.0,!=2.4.0
+six>=1.9.0
+testrepository>=0.0.18
+testscenarios>=0.4
+testtools>=0.9.36,!=1.2.0
diff --git a/tox.ini b/tox.ini
index 54fcc655aa..559741d08c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,6 +26,10 @@ commands =
   bash tools/pretty_tox.sh '{posargs}'
 
 [testenv:integration]
+setenv = VIRTUAL_ENV={envdir}
+         TESTR_START_DIR=heat_integrationtests
+usedevelop = False
+deps = -r{toxinidir}/heat_integrationtests/requirements.txt
 commands =
   bash tools/pretty_tox.sh '--concurrency=1 ^heat_integrationtests.*{posargs}'