diff --git a/‎src/standard/gestures.html‎
Lines changed: 8 additions & 1 deletion b/‎src/standard/gestures.html‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎test/runner.html‎
Lines changed: 1 addition & 0 deletions b/‎test/runner.html‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎test/unit/gestures-elements.html‎
Lines changed: 25 additions & 0 deletions b/‎test/unit/gestures-elements.html‎
Lines changed: 25 additions & 0 deletions
diff --git a/‎test/unit/gestures.html‎
Lines changed: 21 additions & 1 deletion b/‎test/unit/gestures.html‎
Lines changed: 21 additions & 1 deletion
@@ -199,8 +199,11 @@
     handleNative: function(ev) {
       var handled;
       var type = ev.type;
-      var node = ev.currentTarget;
+      var node = wrap(ev.currentTarget);
       var gobj = node[GESTURE_KEY];
+      if (!gobj) {
+        return;
+      }
       var gs = gobj[type];
       if (!gs) {
         return;
@@ -292,6 +295,8 @@
 
     // automate the event listeners for the native events
     add: function(node, evType, handler) {
+      // SD polyfill: handle case where `node` is unwrapped, like `document`
+      node = wrap(node);
       var recognizer = this.gestures[evType];
       var deps = recognizer.deps;
       var name = recognizer.name;
@@ -323,6 +328,8 @@
 
     // automate event listener removal for native events
     remove: function(node, evType, handler) {
+      // SD polyfill: handle case where `node` is unwrapped, like `document`
+      node = wrap(node);
       var recognizer = this.gestures[evType];
       var deps = recognizer.deps;
       var name = recognizer.name;
 
@@ -41,6 +41,7 @@
       'unit/array-selector.html',
       'unit/events.html',
       'unit/gestures.html',
+      'unit/gestures.html?dom=shadow',
       'unit/utils.html',
       'unit/utils-content.html',
       'unit/utils.html?dom=shadow',
 
@@ -139,3 +139,28 @@
     });
   </script>
 </dom-module>
+
+<dom-module id="x-document-listener">
+  <script>
+  Polymer({
+    is: 'x-document-listener',
+    properties: {
+      stream: {
+        type: Array,
+        value: function() {
+        return [];
+        }
+      }
+    },
+    setup: function() {
+      this.listen(document, 'down', 'handler');
+    },
+    teardown: function() {
+      this.unlisten(document, 'down', 'handler');
+    },
+    handler: function(e) {
+      this.stream.push(e);
+    }
+  });
+  </script>
+</dom-module>
@@ -12,7 +12,7 @@
 <head>
   <meta charset="utf-8">
 
-  <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../../webcomponentsjs/webcomponents.js"></script>
   <script src="../../../web-component-tester/browser.js"></script>
 
   <link rel="import" href="../../polymer.html">
@@ -386,6 +386,26 @@
         });
       });
     });
+
+    suite('SD Polyfill', function() {
+      var el;
+      setup(function() {
+        el = document.createElement('x-document-listener');
+        document.body.appendChild(el);
+        el.setup();
+      });
+
+      teardown(function() {
+        el.teardown();
+        document.body.removeChild(el);
+      });
+
+      test('document listener works in SD polyfill', function() {
+        var ev = new CustomEvent('mousedown', {bubbles: true});
+        el.dispatchEvent(ev);
+        assert.equal(el.stream.length, 1);
+      });
+    });
   </script>
 
 </body>