diff --git a/test-requirements.txt b/test-requirements.txt
index e6a846454..5b615c7d9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,6 +12,7 @@ python-subunit>=0.0.18
 requests-mock>=0.5.1  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 oslosphinx>=2.2.0  # Apache-2.0
+oslo.concurrency>=0.3.0,!=0.4.0
 testrepository>=0.0.18
 testtools>=0.9.36,!=1.2.0
 testscenarios>=0.4
diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
index e1bc9acfc..fb0ea2d87 100755
--- a/tools/pretty_tox.sh
+++ b/tools/pretty_tox.sh
@@ -3,4 +3,4 @@
 TESTRARGS=$1
 
 exec 3>&1
-status=$(exec 4>&1 >&3; ( python -m neutron.openstack.common.lockutils python setup.py testr --slowest --testr-args="--subunit $TESTRARGS"; echo $? >&4 ) | $(dirname $0)/subunit-trace.py -f) && exit $status
+status=$(exec 4>&1 >&3; ( lockutils-wrapper python setup.py testr --slowest --testr-args="--subunit $TESTRARGS"; echo $? >&4 ) | $(dirname $0)/subunit-trace.py -f) && exit $status
diff --git a/tox.ini b/tox.ini
index 3d286765f..45188f2b1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ setenv = VIRTUAL_ENV={envdir}
 [testenv:functional]
 setenv = OS_TEST_PATH=./neutron_fwaas/tests/functional
 commands =
-  python -m neutron_fwaas.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
+  lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:dsvm-functional]
 setenv = OS_TEST_PATH=./neutron_fwaas/tests/functional
@@ -37,7 +37,7 @@ setenv = OS_TEST_PATH=./neutron_fwaas/tests/functional
          OS_FAIL_ON_MISSING_DEPS=1
 sitepackages=True
 commands =
-  python -m neutron_fwaas.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
+  lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
 
 [tox:jenkins]
 sitepackages = True
@@ -56,7 +56,7 @@ commands = python ./tools/check_i18n.py ./neutron_fwaas ./tools/i18n_cfg.py
 
 [testenv:cover]
 commands =
-  python -m neutron_fwaas.openstack.common.lockutils python setup.py testr --coverage --testr-args='{posargs}'
+  lockutils-wrapper python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:venv]
 commands = {posargs}