diff --git a/test/mitmproxy/test_master.py b/test/mitmproxy/test_master.py
index 777ab4dd1..f74fe68e2 100644
--- a/test/mitmproxy/test_master.py
+++ b/test/mitmproxy/test_master.py
@@ -1 +1,16 @@
-# TODO: write tests
+import asyncio
+
+from mitmproxy.test.taddons import RecordingMaster
+
+
+async def err():
+    raise RuntimeError
+
+
+async def test_exception_handler():
+    m = RecordingMaster(None)
+    running = asyncio.create_task(m.run())
+    asyncio.create_task(err())
+    await m.await_log("Traceback", level="error")
+    m.shutdown()
+    await running