diff --git a/lib/mixins/template-stamp.html b/lib/mixins/template-stamp.html
index 643740da62..331e32fc2e 100644
--- a/lib/mixins/template-stamp.html
+++ b/lib/mixins/template-stamp.html
@@ -379,7 +379,7 @@
        * @return {DocumentFragment} Content fragment
        */
       static _contentForTemplate(template) {
-        let templateInfo = template.__templateInfo;
+        let templateInfo = template._templateInfo;
         return (templateInfo && templateInfo.content) || template.content;
       }
 
diff --git a/test/runner.html b/test/runner.html
index 8df2426d90..ad9d00e356 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -26,6 +26,7 @@
     var suites = [
       'unit/globals.html',
       'unit/property-accessors.html',
+      'unit/template-stamp.html',
       'unit/property-effects.html',
       'unit/property-effects-template.html',
       'unit/path-effects.html',
diff --git a/test/unit/template-stamp.html b/test/unit/template-stamp.html
new file mode 100644
index 0000000000..70ad52bfc2
--- /dev/null
+++ b/test/unit/template-stamp.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<!--
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+<head>
+  <meta charset="UTF-8">
+
+  <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../../web-component-tester/browser.js"></script>
+
+  <link rel="import" href="../../lib/mixins/template-stamp.html">
+</head>
+<body>
+
+  <template id="test-template">
+    <div id="a">a</div>
+    <div id="eventHandler" on-click="handleClick"></div>
+    <div id="b">b</div>
+    <template id="nestedTemplate">
+      <div on-click="handleClick"></div>
+    </template>
+    <template id="preservedTemplate" preserve-content>
+      <div on-click="shouldNotBeRemoved"></div>
+    </template>
+  </template>
+
+  <script>
+    HTMLImports.whenReady(() => {
+      class TemplateStamper extends Polymer.TemplateStamp(HTMLElement) {
+        connectedCallback() {
+          this.handleClick = sinon.spy(event => {
+            this.handleClickTarget = event.target;
+          });
+          let template = document.getElementById('test-template');
+          this.dom = this._stampTemplate(template);
+          this.attachShadow({mode:'open'}).appendChild(this.dom);
+        }
+      }
+      customElements.define('template-stamper', TemplateStamper);
+    });
+  </script>
+
+  <script>
+
+    suite('template-stamp', () => {
+
+      test('id map', () => {
+        let el = document.createElement('template-stamper');
+        document.body.appendChild(el);
+        assert.equal(el.dom.$.a.textContent, 'a');
+        assert.equal(el.dom.$.b.textContent, 'b');
+        document.body.removeChild(el);
+      });
+
+      test('declarative events', () => {
+        let el = document.createElement('template-stamper');
+        document.body.appendChild(el);
+        el.dom.$.eventHandler.click();
+        assert.equal(el.handleClick.callCount, 1);
+        assert.equal(el.handleClick.firstCall.args[0].type, 'click');
+        assert.equal(el.handleClickTarget, el.dom.$.eventHandler);
+        document.body.removeChild(el);
+      });
+
+      test('cached template content', () => {
+        let el = document.createElement('template-stamper');
+        document.body.appendChild(el);
+        let content = el.constructor._contentForTemplate(el.dom.$.nestedTemplate);
+        assert.isTrue(content instanceof DocumentFragment);
+        assert.equal(content.ownerDocument, el.dom.$.nestedTemplate.content.ownerDocument);
+        assert.equal(content.firstElementChild.getAttribute('on-click'), null);
+        document.body.removeChild(el);
+      });
+
+      test('preserved template content', () => {
+        let el = document.createElement('template-stamper');
+        document.body.appendChild(el);
+        let content = el.dom.$.preservedTemplate.content;
+        assert.isTrue(content instanceof DocumentFragment);
+        assert.equal(content.firstElementChild.getAttribute('on-click'), 'shouldNotBeRemoved');
+        document.body.removeChild(el);
+      });
+
+    });
+
+    // Note template parsing API is tested in `property-effects-template.html`,
+    // combined with adding property effects
+
+  </script>
+
+</body>
+</html>
