diff --git a/test/unit/dom-if.html b/test/unit/dom-if.html
index 3666bde095..ef4a1baddd 100644
--- a/test/unit/dom-if.html
+++ b/test/unit/dom-if.html
@@ -72,14 +72,14 @@
   </div>
 
   <!-- 2.x hybrid test -->
-  <dom-if>
+  <dom-if id="hybridDomIfWrapper">
     <template is="dom-if" id="hybridDomIf" if restamp>
       <div hybrid-stamped>[[prop]]</div>
     </template>
   </dom-if>
 
   <script>
-    /* global configured individual unconfigured1 unconfigured2 inDocumentContainer inDocumentIf structuredContainer structuredDomIf structuredDomBind outerContainer innerContainer shouldBeRemoved toBeRemoved removalContainer hybridDomIf*/
+    /* global configured individual unconfigured1 unconfigured2 inDocumentContainer inDocumentIf structuredContainer structuredDomIf structuredDomBind outerContainer innerContainer shouldBeRemoved toBeRemoved removalContainer hybridDomIf hybridDomIfWrapper*/
 
     suite('hybrid dom-if', function() {
 
@@ -89,6 +89,17 @@
         assert.equal(stamped[0].parentNode, document.body);
       });
 
+      test('remove & re-add works correctly', function() {
+        var wrapper = hybridDomIfWrapper;
+        Polymer.dom(document.body).removeChild(wrapper);
+        Polymer.dom(document.body).appendChild(wrapper);
+        CustomElements.takeRecords();
+        hybridDomIf.render();
+        var stamped = Array.from(document.querySelectorAll('[hybrid-stamped]'));
+        assert.equal(stamped.length, 1);
+        assert.equal(stamped[0].parentNode, document.body);
+      });
+
       test('children removed correctly', function() {
         hybridDomIf.if = false;
         hybridDomIf.render();