diff --git a/nova/wsgi/metadata.py b/nova/wsgi/metadata.py
index e033b71cec52..fec9ba1be81e 100644
--- a/nova/wsgi/metadata.py
+++ b/nova/wsgi/metadata.py
@@ -19,6 +19,7 @@ from nova.api.openstack import wsgi_app
 NAME = "metadata"
 
 application = None
-with threading.Lock():
+lock = threading.Lock()
+with lock:
     if application is None:
         application = wsgi_app.init_application(NAME)
diff --git a/nova/wsgi/osapi_compute.py b/nova/wsgi/osapi_compute.py
index 7f4de03b0715..12403b746ebb 100644
--- a/nova/wsgi/osapi_compute.py
+++ b/nova/wsgi/osapi_compute.py
@@ -19,6 +19,7 @@ from nova.api.openstack import wsgi_app
 NAME = "osapi_compute"
 
 application = None
-with threading.Lock():
+lock = threading.Lock()
+with lock:
     if application is None:
         application = wsgi_app.init_application(NAME)