diff --git a/nova/test.py b/nova/test.py
index 129168ad33e6..c25b1927dfe5 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -30,6 +30,7 @@ import copy
 import os
 import shutil
 import sys
+import tempfile
 import uuid
 
 import fixtures
@@ -252,6 +253,8 @@ 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