diff --git a/oslo/messaging/_drivers/impl_fake.py b/oslo/messaging/_drivers/impl_fake.py
index dfe243f53..dfce5a4a8 100644
--- a/oslo/messaging/_drivers/impl_fake.py
+++ b/oslo/messaging/_drivers/impl_fake.py
@@ -132,7 +132,7 @@ class FakeExchangeManager(object):
     def get_exchange(self, name):
         if name is None:
             name = self._default_exchange
-        while self._exchanges_lock:
+        with self._exchanges_lock:
             return self._exchanges.setdefault(name, FakeExchange(name))