diff --git a/src/standard/styling.html b/src/standard/styling.html
index 3fdec1ab2f..60fb7ce910 100644
--- a/src/standard/styling.html
+++ b/src/standard/styling.html
@@ -63,7 +63,7 @@
           // only if no custom properties are used since otherwise
           // styles are applied via property shimming.
           if (!this._needsStyleProperties() && this._styles.length) {
-            var style = styleUtil.applyCss(cssText, this.is,
+            styleUtil.applyCss(cssText, this.is,
               nativeShadow ? this._template.content : null, this._scopeStyle);
           }
         } else {
diff --git a/test/unit/base.html b/test/unit/base.html
index 9fc827d591..233ef35c81 100644
--- a/test/unit/base.html
+++ b/test/unit/base.html
@@ -23,14 +23,14 @@
 </head>
 <body>
 <script>
+(function() {
 
 var Child;
 var instance;
 
 setup(function() {
   // Ensure a clean environment for each test.
-  /* global Base */
-  window.Child = Object.create(Polymer.Base);
+  Child = Object.create(Polymer.Base);
   Child.is = 'x-child';
   Child._registerFeatures = function() {};
   Child._initFeatures = function() {};
@@ -41,7 +41,7 @@
       this[name].apply(this, args || []);
     }
   };
-  window.instance = Object.create(Child);
+  instance = Object.create(Child);
 });
 
 suite('addFeature', function() {
@@ -139,6 +139,7 @@
 
 });
 
+})();
 </script>
 </body>
 </html>
