diff --git a/quantum/tests/unit/__init__.py b/quantum/tests/unit/__init__.py
index 84bd5069f0..203b3cf3f7 100644
--- a/quantum/tests/unit/__init__.py
+++ b/quantum/tests/unit/__init__.py
@@ -30,6 +30,9 @@ from quantum.openstack.common import cfg
 reldir = os.path.join(os.path.dirname(__file__), '..', '..', '..')
 absdir = os.path.abspath(reldir)
 cfg.CONF.state_path = absdir
+# An empty lock path forces lockutils.synchronized to use a temporary
+# location for lock files that will be cleaned up automatically.
+cfg.CONF.lock_path = ''
 
 
 class BaseTest(unittest.TestCase):