diff --git a/packages/spacebars-tests/template_tests.html b/packages/spacebars-tests/template_tests.html
index 0f2e733dcd..ba8f20fa27 100644
--- a/packages/spacebars-tests/template_tests.html
+++ b/packages/spacebars-tests/template_tests.html
@@ -726,3 +726,13 @@ Hi there!
   <img src="{{foo}}" />
   <input value="{{foo}}" />
 </template>
+
+<template name="spacebars_test_event_handler_cleanup">
+  {{#if foo}}
+    {{>spacebars_test_event_handler_cleanup_sub}}
+  {{/if}}
+</template>
+
+<template name="spacebars_test_event_handler_cleanup_sub">
+  <div></div>
+</template>
diff --git a/packages/spacebars-tests/template_tests.js b/packages/spacebars-tests/template_tests.js
index f6eff667fd..a222349045 100644
--- a/packages/spacebars-tests/template_tests.js
+++ b/packages/spacebars-tests/template_tests.js
@@ -2021,3 +2021,31 @@ Tinytest.add(
     checkAttrs("    javascript:alert(1)", false);
   }
 );
+
+Tinytest.add(
+  "spacebars - template - event handlers get cleaned up with template is removed",
+  function (test) {
+    var tmpl = Template.spacebars_test_event_handler_cleanup;
+    var subtmpl = Template.spacebars_test_event_handler_cleanup_sub;
+
+    var rv = new ReactiveVar(true);
+    tmpl.foo = function () {
+      return rv.get();
+    };
+
+    subtmpl.events({
+      "click/mouseover": function () { }
+    });
+
+    var div = renderToDiv(tmpl);
+
+    test.equal(div.$_uievents["click"].handlers.length, 1);
+    test.equal(div.$_uievents["mouseover"].handlers.length, 1);
+
+    rv.set(false);
+    Deps.flush();
+
+    test.equal(div.$_uievents["click"].handlers.length, 0);
+    test.equal(div.$_uievents["mouseover"].handlers.length, 0);
+  }
+);