diff --git a/test/unit/dom-if-elements.js b/test/unit/dom-if-elements.js
index 0d892fe936..a173f77a2c 100644
--- a/test/unit/dom-if-elements.js
+++ b/test/unit/dom-if-elements.js
@@ -126,14 +126,14 @@ Polymer({
       <x-foo prop="{{prop1}}"></x-foo>
       <template is="dom-if" id="if-2" if="{{shouldStamp2}}">
         <x-foo prop="{{prop2}}"></x-foo>
-        <template is="dom-if" id="if-3" if="{{shouldStamp3}}" restamp>
-          <x-foo prop="{{prop3}}"></x-foo>
+        <template is="dom-if" id="if-3-1" if="{{shouldStamp3_1}}" restamp>
+          <x-foo prop="{{prop3_1}}"></x-foo>
         </template>
-        <template is="dom-if" id="if-4" if="{{shouldStamp4}}" restamp>
-          <x-foo prop="{{prop4}}"></x-foo>
+        <template is="dom-if" id="if-4-2" if="{{shouldStamp3_2}}" restamp>
+          <x-foo prop="{{prop3_2}}"></x-foo>
         </template>
-        <template is="dom-if" id="if-5" if="{{shouldStamp5}}" restamp>
-          <x-foo prop="{{prop5}}"></x-foo>
+        <template is="dom-if" id="if-5-3" if="{{shouldStamp3_3}}" restamp>
+          <x-foo prop="{{prop3_3}}"></x-foo>
         </template>
       </template>
     </template>
@@ -148,14 +148,14 @@ Polymer({
     prop2: {
       value: 'prop2'
     },
-    prop3: {
-      value: 'prop3'
+    prop3_1: {
+      value: 'prop3_1'
     },
-    prop4: {
-      value: 'prop4'
+    prop3_2: {
+      value: 'prop3_2'
     },
-    prop5: {
-      value: 'prop5'
+    prop3_3: {
+      value: 'prop3_3'
     },
     item: {
       value: function() { return {prop: 'outerItem'}; }
diff --git a/test/unit/dom-if.html b/test/unit/dom-if.html
index d16c654dc1..09d578a3e7 100644
--- a/test/unit/dom-if.html
+++ b/test/unit/dom-if.html
@@ -178,87 +178,87 @@
     assert.equal(getComputedStyle(stamped[1]).display, 'inline', 'stamped 2 display wrong');
   });
 
-  test('show 3', function() {
-    individual.shouldStamp3 = true;
+  test('show 3-1', function() {
+    individual.shouldStamp3_1 = true;
     individual.render();
     let stamped = individual.shadowRoot.querySelectorAll('*:not(template):not(dom-if):not(span)');
     assert.equal(stamped.length, 3, 'total stamped count incorrect');
     assert.equal(stamped[0].prop, 'prop1');
     assert.equal(stamped[1].prop, 'prop2');
-    assert.equal(stamped[2].prop, 'prop3');
+    assert.equal(stamped[2].prop, 'prop3_1');
     assert.equal(getComputedStyle(stamped[0]).display, 'inline', 'stamped 1 display wrong');
     assert.equal(getComputedStyle(stamped[1]).display, 'inline', 'stamped 2 display wrong');
-    assert.equal(getComputedStyle(stamped[2]).display, 'inline', 'stamped 3 display wrong');
+    assert.equal(getComputedStyle(stamped[2]).display, 'inline', 'stamped 3-1 display wrong');
   });
 
-  test('show 4', function() {
-    individual.shouldStamp4 = true;
+  test('show 3-2', function() {
+    individual.shouldStamp3_2 = true;
     individual.render();
     let stamped = individual.shadowRoot.querySelectorAll('*:not(template):not(dom-if):not(span)');
     assert.equal(stamped.length, 4, 'total stamped count incorrect');
     assert.equal(stamped[0].prop, 'prop1');
     assert.equal(stamped[1].prop, 'prop2');
-    assert.equal(stamped[2].prop, 'prop3');
-    assert.equal(stamped[3].prop, 'prop4');
+    assert.equal(stamped[2].prop, 'prop3_1');
+    assert.equal(stamped[3].prop, 'prop3_2');
     assert.equal(getComputedStyle(stamped[0]).display, 'inline', 'stamped 1 display wrong');
     assert.equal(getComputedStyle(stamped[1]).display, 'inline', 'stamped 2 display wrong');
-    assert.equal(getComputedStyle(stamped[2]).display, 'inline', 'stamped 3 display wrong');
-    assert.equal(getComputedStyle(stamped[3]).display, 'inline', 'stamped 4 display wrong');
+    assert.equal(getComputedStyle(stamped[2]).display, 'inline', 'stamped 3-1 display wrong');
+    assert.equal(getComputedStyle(stamped[3]).display, 'inline', 'stamped 3-2 display wrong');
   });
 
-  test('remove 4', function() {
-    individual.shouldStamp4 = false;
+  test('remove 3-2', function() {
+    individual.shouldStamp3_2 = false;
     individual.render();
     let stamped = individual.shadowRoot.querySelectorAll('*:not(template):not(dom-if):not(span)');
     assert.equal(stamped.length, 3, 'total stamped count incorrect');
     assert.equal(stamped[0].prop, 'prop1');
     assert.equal(stamped[1].prop, 'prop2');
-    assert.equal(stamped[2].prop, 'prop3');
+    assert.equal(stamped[2].prop, 'prop3_1');
     assert.equal(getComputedStyle(stamped[0]).display, 'inline', 'stamped 1 display wrong');
     assert.equal(getComputedStyle(stamped[1]).display, 'inline', 'stamped 2 display wrong');
-    assert.equal(getComputedStyle(stamped[2]).display, 'inline', 'stamped 3 display wrong');
+    assert.equal(getComputedStyle(stamped[2]).display, 'inline', 'stamped 3-1 display wrong');
   });
 
-  test('show 5', function() {
-    individual.shouldStamp5 = true;
+  test('show 3-3', function() {
+    individual.shouldStamp3_3 = true;
     individual.render();
     let stamped = individual.shadowRoot.querySelectorAll('*:not(template):not(dom-if):not(span)');
     assert.equal(stamped.length, 4, 'total stamped count incorrect');
     assert.equal(stamped[0].prop, 'prop1');
     assert.equal(stamped[1].prop, 'prop2');
-    assert.equal(stamped[2].prop, 'prop3');
-    assert.equal(stamped[3].prop, 'prop5');
+    assert.equal(stamped[2].prop, 'prop3_1');
+    assert.equal(stamped[3].prop, 'prop3_3');
     assert.equal(getComputedStyle(stamped[0]).display, 'inline', 'stamped 1 display wrong');
     assert.equal(getComputedStyle(stamped[1]).display, 'inline', 'stamped 2 display wrong');
-    assert.equal(getComputedStyle(stamped[2]).display, 'inline', 'stamped 3 display wrong');
-    assert.equal(getComputedStyle(stamped[3]).display, 'inline', 'stamped 5 display wrong');
+    assert.equal(getComputedStyle(stamped[2]).display, 'inline', 'stamped 3-1 display wrong');
+    assert.equal(getComputedStyle(stamped[3]).display, 'inline', 'stamped 3-3 display wrong');
   });
 
-  test('update 5', function() {
-    individual.prop5 = 'prop5*';
+  test('update 3-3', function() {
+    individual.prop3_3 = 'prop3_3*';
     let stamped = individual.shadowRoot.querySelectorAll('*:not(template):not(dom-if):not(span)');
     assert.equal(stamped.length, 4, 'total stamped count incorrect');
     assert.equal(stamped[0].prop, 'prop1');
     assert.equal(stamped[1].prop, 'prop2');
-    assert.equal(stamped[2].prop, 'prop3');
-    assert.equal(stamped[3].prop, 'prop5*');
+    assert.equal(stamped[2].prop, 'prop3_1');
+    assert.equal(stamped[3].prop, 'prop3_3*');
   });
 
-  test('remove 5', function() {
-    individual.shouldStamp5 = false;
+  test('remove 3-3', function() {
+    individual.shouldStamp3_3 = false;
     individual.render();
     let stamped = individual.shadowRoot.querySelectorAll('*:not(template):not(dom-if):not(span)');
     assert.equal(stamped.length, 3, 'total stamped count incorrect');
     assert.equal(stamped[0].prop, 'prop1');
     assert.equal(stamped[1].prop, 'prop2');
-    assert.equal(stamped[2].prop, 'prop3');
+    assert.equal(stamped[2].prop, 'prop3_1');
     assert.equal(getComputedStyle(stamped[0]).display, 'inline', 'stamped 1 display wrong');
     assert.equal(getComputedStyle(stamped[1]).display, 'inline', 'stamped 2 display wrong');
-    assert.equal(getComputedStyle(stamped[2]).display, 'inline', 'stamped 3 display wrong');
+    assert.equal(getComputedStyle(stamped[2]).display, 'inline', 'stamped 3-1 display wrong');
   });
 
   test('remove 3', function() {
-    individual.shouldStamp3 = false;
+    individual.shouldStamp3_1 = false;
     individual.render();
     let stamped = individual.shadowRoot.querySelectorAll('*:not(template):not(dom-if):not(span)');
     assert.equal(stamped.length, 2, 'total stamped count incorrect');
@@ -305,7 +305,7 @@
   });
 
   test('show 3', function() {
-    individual.shouldStamp3 = true;
+    individual.shouldStamp3_1 = true;
     individual.render();
     let stamped = individual.shadowRoot.querySelectorAll('*:not(template):not(dom-if):not(span)');
     assert.equal(stamped.length, 3, 'total stamped count incorrect');