diff --git a/test/monkey_driver.py b/test/monkey_driver.py
index 62d5766a8..fe904d3bf 100755
--- a/test/monkey_driver.py
+++ b/test/monkey_driver.py
@@ -643,6 +643,8 @@ def run_test_step_action_quit(ctx, step):
     assert_browser(ctx)
     browser = ctx.pop('browser')
     assert browser.quit_and_wait()
+    # clean up context as all windows have gone away after browser quit
+    ctx.pop('windows')
 
 
 STEP_HANDLERS = {