diff --git a/nova/test.py b/nova/test.py
index 8c89c783fbfb..a613ee914a97 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -31,7 +31,6 @@ import gettext
 import os
 import shutil
 import sys
-import tempfile
 import uuid
 
 import fixtures
@@ -264,8 +263,6 @@ class TestCase(testtools.TestCase):
         CONF.set_override('fatal_exception_format_errors', True)
         CONF.set_override('enabled', True, 'osapi_v3')
         CONF.set_override('force_dhcp_release', False)
-        # This will be cleaned up by the NestedTempfile fixture
-        CONF.set_override('lock_path', tempfile.mkdtemp())
 
     def _restore_obj_registry(self):
         objects_base.NovaObject._obj_classes = self._base_test_obj_backup
diff --git a/nova/tests/conf_fixture.py b/nova/tests/conf_fixture.py
index 3c3170c31f08..e29087f18f7e 100644
--- a/nova/tests/conf_fixture.py
+++ b/nova/tests/conf_fixture.py
@@ -53,7 +53,6 @@ class ConfFixture(config_fixture.Config):
                               'nova.tests.utils.dns_manager')
         self.conf.set_default('instance_dns_manager',
                               'nova.tests.utils.dns_manager')
-        self.conf.set_default('lock_path', None)
         self.conf.set_default('network_size', 8)
         self.conf.set_default('num_networks', 2)
         self.conf.set_default('rpc_backend',
diff --git a/tox.ini b/tox.ini
index 53e10c8e4436..8f5970705e3e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
-  python setup.py test --slowest --testr-args='{posargs}'
+  python -m nova.openstack.common.lockutils python setup.py test --slowest --testr-args='{posargs}'
 
 [tox:jenkins]
 sitepackages = True