diff --git a/lib/mixins/lazy-upgrade-mixin.html b/lib/mixins/lazy-upgrade-mixin.html
index 8ec870b0aa..174cedc0f6 100644
--- a/lib/mixins/lazy-upgrade-mixin.html
+++ b/lib/mixins/lazy-upgrade-mixin.html
@@ -64,7 +64,6 @@
 
       /** @polymerMixinClass */
       return class LazyUpgrade extends base {
-        // add a configurable
         static get properties() {
           return {
             /**
diff --git a/test/unit/lazy-upgrade.html b/test/unit/lazy-upgrade.html
index fe81561443..1d8ca3017f 100644
--- a/test/unit/lazy-upgrade.html
+++ b/test/unit/lazy-upgrade.html
@@ -9,7 +9,7 @@
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <meta charset="utf-8">
-<script src="../../../webcomponentsjs/webcomponents-loader.js"></script>
+<script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
 <script src="../../../web-component-tester/browser.js"></script>
 <link rel="import" href="../../polymer-element.html">
 <link rel="import" href="../../lib/elements/dom-if.html">
@@ -18,10 +18,7 @@
 <link rel="import" href="../../lib/utils/debounce.html">
 
 <script>
-  let Loaded = new Promise((resolve) => {
-    addEventListener('WebComponentsReady', () => {resolve()});
-  });
-  Loaded.then(function() {
+  addEventListener('WebComponentsReady', function() {
     let async = Polymer.Async.timeOut.after(150);
     window.LazyParentMixin = class LazyParent extends Polymer.LazyUpgradeMixin(Polymer.Element) {
       static get observers() {
@@ -54,7 +51,7 @@
     </style>
   </template>
   <script>
-    Loaded.then(function() {
+    addEventListener('WebComponentsReady', function() {
       class LazyChild extends Polymer.Element {
         static get is() {return 'lazy-child'}
         ready() {
@@ -81,7 +78,7 @@
     </dom-if>
   </template>
   <script>
-    Loaded.then(function() {
+    addEventListener('WebComponentsReady', function() {
       customElements.define('lazy-upgrade-shadow', class extends window.LazyParentMixin {
         static get is() { return 'lazy-upgrade-shadow' }
       });
@@ -91,7 +88,7 @@
 
 <dom-module id="lazy-parent">
   <script>
-    Loaded.then(function() {
+    addEventListener('WebComponentsReady', function() {
       customElements.define('lazy-parent', class extends window.LazyParentMixin {});
     });
   </script>
@@ -143,7 +140,7 @@
   </template>
 </dom-module>
 <script>
-  Loaded.then(() => {
+  addEventListener('WebComponentsReady', () => {
     customElements.define('no-upgrade-shadow', class extends Polymer.Element {
       static get is() { return 'no-upgrade-shadow' }
     });