diff --git a/econtext/core.py b/econtext/core.py
index e7d190d3..a0775d1e 100644
--- a/econtext/core.py
+++ b/econtext/core.py
@@ -650,7 +650,7 @@ class Broker(object):
         self._alive = False
         self._waker.wake()
 
-    def wait(self):
+    def join(self):
         """Wait for the broker to stop."""
         self._thread.join()
 
@@ -736,4 +736,4 @@ class ExternalContext(object):
             LOG.debug('ExternalContext.main() exitting')
         finally:
             self.broker.shutdown()
-            self.broker.wait()
+            self.broker.join()
diff --git a/econtext/utils.py b/econtext/utils.py
index c355f1ce..47eed5ec 100644
--- a/econtext/utils.py
+++ b/econtext/utils.py
@@ -28,7 +28,7 @@ def run_with_broker(func, *args, **kwargs):
         return func(broker, *args, **kwargs)
     finally:
         broker.shutdown()
-        broker.wait()
+        broker.join()
 
 
 def with_broker(func):