diff --git a/test/spec/modes/add_point.js b/test/spec/modes/add_point.js
index d3518ead9..080a86d3b 100644
--- a/test/spec/modes/add_point.js
+++ b/test/spec/modes/add_point.js
@@ -20,6 +20,7 @@ describe("iD.modes.AddPoint", function() {
             happen.mouseup(window, {});
             expect(context.changes().created).to.have.length(1);
             context.mode().exit();
+            d3.select('window').on('click.draw-block', null);
         });
 
         it("selects the node", function() {
diff --git a/test/spec/spec_helpers.js b/test/spec/spec_helpers.js
index 1df2537e0..2c15b7567 100644
--- a/test/spec/spec_helpers.js
+++ b/test/spec/spec_helpers.js
@@ -8,7 +8,8 @@ mocha.setup({
         '__onmouseup.zoom',
         '__onkeydown.select',
         '__onkeyup.select',
-        '__onclick.draw'
+        '__onclick.draw',
+        '__onclick.draw-block'
     ]
 });