diff --git a/.eslintrc.json b/.eslintrc.json
index ca39b269..e5b26e55 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -13,8 +13,11 @@
   ],
   "globals": {
     "CustomElements": true,
+    "customElements": true,
     "HTMLImports": true,
     "Polymer": true,
-    "ShadyDom": true
+    "ShadyDOM": true,
+    "ShadyCSS": true,
+    "ApplyShim": true
   }
 }
diff --git a/src/events/gesture-event-listeners.html b/src/events/gesture-event-listeners.html
index 415e1c73..1c9edc2b 100644
--- a/src/events/gesture-event-listeners.html
+++ b/src/events/gesture-event-listeners.html
@@ -272,7 +272,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         }
       }
       // enforce gesture recognizer order
-      for (i = 0, r; i < recognizers.length; i++) {
+      for (let i = 0, r; i < recognizers.length; i++) {
         r = recognizers[i];
         if (gs[r.name] && !handled[r.name]) {
           handled[r.name] = true;
diff --git a/src/templatizer/templatizer.html b/src/templatizer/templatizer.html
index 68a8c43c..f1a968c4 100644
--- a/src/templatizer/templatizer.html
+++ b/src/templatizer/templatizer.html
@@ -18,11 +18,11 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   (function() {
     'use strict';
 
-    class nullClass {};
+    class nullClass {}
 
     function PatchedHTMLTemplateElement() {
       return PatchedHTMLTemplateElement._newInstance;
-    };
+    }
     PatchedHTMLTemplateElement.prototype = Object.create(HTMLTemplateElement.prototype, {
       constructor: {
         value: PatchedHTMLTemplateElement
diff --git a/test/unit/bind.html b/test/unit/bind.html
index 917c0481..62a9a953 100644
--- a/test/unit/bind.html
+++ b/test/unit/bind.html
@@ -849,7 +849,7 @@ suite('warnings', function() {
   });
 
   test('binding to a bad attribute warns', function() {
-    var el = document.createElement('x-bind-bad-attribute-name');
+    document.createElement('x-bind-bad-attribute-name');
     assert.isTrue(console.warn.calledOnce, 'no warning for setting a bad attribute');
   });
 
diff --git a/test/unit/shady-content.html b/test/unit/shady-content.html
index b779f713..208879d6 100644
--- a/test/unit/shady-content.html
+++ b/test/unit/shady-content.html
@@ -857,7 +857,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       var s1 = document.createElement('span');
       var s2 = document.createElement('span');
       var s3 = document.createElement('span');
-      var composedChildren;
       frag.appendChild(s1);
       frag.appendChild(s2);
       frag.appendChild(s3);
@@ -881,7 +880,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       var s1 = document.createElement('span');
       var s2 = document.createElement('span');
       var s3 = document.createElement('span');
-      var composedChildren;
       frag.appendChild(s1);
       frag.appendChild(s2);
       frag.appendChild(s3);