diff --git a/.testr.conf b/.testr.conf
index b63d965523c..c180b0319fb 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ neutron/tests $LISTOPT $IDOPTION
+test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./neutron/tests/unit} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/tox.ini b/tox.ini
index 22eed4b4ad6..69a4d70057c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,11 @@ deps = -r{toxinidir}/requirements.txt
 commands =
   python -m neutron.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
 
+[testenv:functional]
+setenv = OS_TEST_PATH=./neutron/tests/functional
+commands =
+  python setup.py testr --slowest --testr-args='{posargs}'
+
 [tox:jenkins]
 sitepackages = True
 downloadcache = ~/cache/pip