From f39aaa8c7616cadb61787329716696bd2778b0ba Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Thu, 19 Apr 2018 17:27:03 -0700
Subject: [PATCH] Remove extra polymer-legacy.js imports

---
 test/perf/binding-expressions.html              | 1 -
 test/perf/perf-tests.html                       | 1 -
 test/smoke/data-table.html                      | 2 --
 test/smoke/dirty-check.html                     | 2 --
 test/smoke/disable-upgrade.html                 | 3 ---
 test/smoke/disabled-attr-gestures.html          | 1 -
 test/smoke/dom-if.html                          | 1 -
 test/smoke/gestures.html                        | 1 -
 test/smoke/ordering-test.html                   | 1 -
 test/smoke/passive-gestures.html                | 1 -
 test/unit/array-selector.html                   | 1 -
 test/unit/attributes.html                       | 1 -
 test/unit/configure.html                        | 3 ---
 test/unit/css-parse.html                        | 1 -
 test/unit/custom-style-async.html               | 1 -
 test/unit/custom-style-scope-cache.html         | 1 -
 test/unit/custom-style.html                     | 2 --
 test/unit/dir.html                              | 6 ------
 test/unit/disable-upgrade.html                  | 5 -----
 test/unit/dom-bind.html                         | 3 ---
 test/unit/dom-if.html                           | 2 --
 test/unit/dom-repeat.html                       | 2 --
 test/unit/events.html                           | 1 -
 test/unit/gestures-elements.js                  | 1 -
 test/unit/gestures.html                         | 1 -
 test/unit/globals.html                          | 1 -
 test/unit/html-tag.html                         | 1 -
 test/unit/inheritance.html                      | 6 ------
 test/unit/logging.html                          | 1 -
 test/unit/mixin-behaviors.html                  | 6 ------
 test/unit/mixin-utils.html                      | 1 -
 test/unit/multi-style.html                      | 1 -
 test/unit/path-effects.html                     | 1 -
 test/unit/polymer-dom-observeNodes.html         | 1 -
 test/unit/polymer-dom.html                      | 1 -
 test/unit/polymer.legacyelement.html            | 3 ---
 test/unit/properties-changed.html               | 2 --
 test/unit/property-accessors.html               | 2 --
 test/unit/property-effects-elements.js          | 1 -
 test/unit/property-effects.html                 | 1 -
 test/unit/ready-attached-order-class.html       | 7 -------
 test/unit/ready-attached-order.html             | 2 --
 test/unit/render-status.html                    | 2 --
 test/unit/resolveurl.html                       | 2 --
 test/unit/shady-dynamic.html                    | 1 -
 test/unit/shady-events.html                     | 1 -
 test/unit/shady-unscoped-style.html             | 3 ---
 test/unit/styling-cross-scope-apply.html        | 1 -
 test/unit/styling-cross-scope-unknown-host.html | 2 --
 test/unit/styling-cross-scope-var.html          | 1 -
 test/unit/styling-import.html                   | 4 ----
 test/unit/styling-only-with-template.html       | 2 --
 test/unit/styling-scoped.html                   | 7 -------
 test/unit/template-whitespace.html              | 1 -
 test/unit/templatize.html                       | 1 -
 55 files changed, 111 deletions(-)

diff --git a/test/perf/binding-expressions.html b/test/perf/binding-expressions.html
index 381023e24c..9b9f32a4f5 100644
--- a/test/perf/binding-expressions.html
+++ b/test/perf/binding-expressions.html
@@ -57,7 +57,6 @@
   </template>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import { StrictBindingParser } from '../../lib/mixins/strict-binding-parser.js';
 import { PolymerElement } from '../../polymer-element.js';
 var COUNT = 1000;
diff --git a/test/perf/perf-tests.html b/test/perf/perf-tests.html
index 74ac4112be..8ea32f6386 100644
--- a/test/perf/perf-tests.html
+++ b/test/perf/perf-tests.html
@@ -19,7 +19,6 @@
   <perf-tester runs="25"></perf-tester>
 
   <script type="module">
-import '../../polymer-legacy.js';
 document.querySelector('perf-tester').tests = [
   'binding-expressions.html'
 ];
diff --git a/test/smoke/data-table.html b/test/smoke/data-table.html
index 5690f1fde6..5366a73fba 100644
--- a/test/smoke/data-table.html
+++ b/test/smoke/data-table.html
@@ -19,7 +19,6 @@
 <body>
 
   <script type="module">
-import '../../polymer-legacy.js';
 window.emojiByType = {
   a: '😎',
   b: '💰',
@@ -215,7 +214,6 @@ <h3>Table {{index}}:</h3>
       </div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import { Polymer, version as version$0 } from '../../lib/utils/boot.js';
 var params = document.location.search.substring(1).split('&').map(p=>p.split('='))
   .reduce((m, p)=>{return m[p[0]] = p[1], m;}, {});
diff --git a/test/smoke/dirty-check.html b/test/smoke/dirty-check.html
index 6aac8cc500..6c2489426a 100644
--- a/test/smoke/dirty-check.html
+++ b/test/smoke/dirty-check.html
@@ -22,7 +22,6 @@ <h1>1 + [[foo]] = [[bar]]</h1>
   </template>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class XHost extends PolymerElement {
   static get config() {
@@ -54,7 +53,6 @@ <h1>1 + [[foo]] = [[bar]]</h1>
 <x-host id="host"></x-host>
 
 <script type="module">
-import '../../polymer-legacy.js';
 var obj = {foo: true};
 host.obj = obj;
 host.obj = obj;
diff --git a/test/smoke/disable-upgrade.html b/test/smoke/disable-upgrade.html
index 323f80763c..a39c446abe 100644
--- a/test/smoke/disable-upgrade.html
+++ b/test/smoke/disable-upgrade.html
@@ -6,7 +6,6 @@
 </head>
 <body>
   <script type="module">
-import '../../polymer-legacy.js';
 import { DisableUpgradeMixin } from '../../lib/mixins/disable-upgrade-mixin.js';
 const ogDefine = window.customElements.ogDefine = window.customElements.define;
 window.customElements.defineWithDisabled = function(name, constructor) {
@@ -32,7 +31,6 @@ <h2>[[prop]]</h2>
     </template>
 
     <script type="module">
-import '../../polymer-legacy.js';
 import '../../lib/mixins/disable-upgrade-mixin.js';
 import { PolymerElement } from '../../polymer-element.js';
 class Disabled extends PolymerElement {
@@ -76,7 +74,6 @@ <h3>x-disabled with disable-upgrade</h3>
     </template>
 
     <script type="module">
-import '../../polymer-legacy.js';
 import '../../lib/mixins/disable-upgrade-mixin.js';
 import { PolymerElement } from '../../polymer-element.js';
 
diff --git a/test/smoke/disabled-attr-gestures.html b/test/smoke/disabled-attr-gestures.html
index 245531df23..38fe0babd6 100644
--- a/test/smoke/disabled-attr-gestures.html
+++ b/test/smoke/disabled-attr-gestures.html
@@ -23,7 +23,6 @@
       </div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import { GestureEventListeners } from '../../lib/mixins/gesture-event-listeners.js';
 import { PolymerElement } from '../../polymer-element.js';
 class XDisabled extends GestureEventListeners(PolymerElement) {
diff --git a/test/smoke/dom-if.html b/test/smoke/dom-if.html
index 320df6023a..96c751f1bb 100644
--- a/test/smoke/dom-if.html
+++ b/test/smoke/dom-if.html
@@ -35,7 +35,6 @@
    
     <!-- Uncomment for class syntax -->
     <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class MyElement extends PolymerElement {
   static get is() { return 'my-element'; }
diff --git a/test/smoke/gestures.html b/test/smoke/gestures.html
index abf625d7f7..44c9727c2b 100644
--- a/test/smoke/gestures.html
+++ b/test/smoke/gestures.html
@@ -41,7 +41,6 @@
   <button onclick="console.log('This is working after a few clicks')">Click last</button>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import { version } from '../../lib/utils/boot.js';
 console.log("Using: " + version);
 console.log("Ready to start bug demo");
diff --git a/test/smoke/ordering-test.html b/test/smoke/ordering-test.html
index 5314236b9c..2506299af8 100644
--- a/test/smoke/ordering-test.html
+++ b/test/smoke/ordering-test.html
@@ -18,7 +18,6 @@
 <body>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class XA extends PolymerElement {
   static get template() {
diff --git a/test/smoke/passive-gestures.html b/test/smoke/passive-gestures.html
index 22706d5ded..c63aafe938 100644
--- a/test/smoke/passive-gestures.html
+++ b/test/smoke/passive-gestures.html
@@ -13,7 +13,6 @@
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module">
-import '../../polymer-legacy.js';
 import { setPassiveTouchGestures } from '../../lib/utils/settings.js';
 setPassiveTouchGestures(true);
 </script>
diff --git a/test/unit/array-selector.html b/test/unit/array-selector.html
index b1fd6cd180..4358c7b02e 100644
--- a/test/unit/array-selector.html
+++ b/test/unit/array-selector.html
@@ -47,7 +47,6 @@
 </test-fixture>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import './array-selector-elements.js';
 suite('single selection', function() {
 
diff --git a/test/unit/attributes.html b/test/unit/attributes.html
index f762cd95dc..a96275d939 100644
--- a/test/unit/attributes.html
+++ b/test/unit/attributes.html
@@ -89,7 +89,6 @@
   </test-fixture>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './attributes-elements.js';
 suite('create-time deserialization', function() {
   function testAttributesMatchDefaults(element) {
diff --git a/test/unit/configure.html b/test/unit/configure.html
index ceea00da02..44492e8174 100644
--- a/test/unit/configure.html
+++ b/test/unit/configure.html
@@ -18,7 +18,6 @@
 </head>
 <body>
   <script type="module">
-import '../../polymer-legacy.js';
 window.configureBehavior = {
 
   changeHandlerCount: 0,
@@ -259,7 +258,6 @@
   </dom-module>
 
   <script type="module">
-import '../../polymer-legacy.js';
 window.XConfigLazy = {
   is: 'x-config-lazy',
   properties: {
@@ -298,7 +296,6 @@
       <div>x-config-lazy-nodefaults</div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 window.XConfigLazyNoDefaults = {
   is: 'x-config-lazy-nodefaults',
   properties: {
diff --git a/test/unit/css-parse.html b/test/unit/css-parse.html
index 3c92c05a03..9ad179934c 100644
--- a/test/unit/css-parse.html
+++ b/test/unit/css-parse.html
@@ -100,7 +100,6 @@
     .bar {}
   </style>
 <script type="module">
-import '../../polymer-legacy.js';
 
 function sanitizeCss(text) {
   return text.replace(/[\s]+/g, ' ').trim();
diff --git a/test/unit/custom-style-async.html b/test/unit/custom-style-async.html
index b051d35a13..a1c0a67bfb 100644
--- a/test/unit/custom-style-async.html
+++ b/test/unit/custom-style-async.html
@@ -42,7 +42,6 @@
   <x-host id="host"></x-host>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import { afterNextRender } from '../../lib/utils/render-status.js';
 /* global host */
 
diff --git a/test/unit/custom-style-scope-cache.html b/test/unit/custom-style-scope-cache.html
index b5909e88fa..94efee3895 100644
--- a/test/unit/custom-style-scope-cache.html
+++ b/test/unit/custom-style-scope-cache.html
@@ -47,7 +47,6 @@
   <cache-element id="cache2"></cache-element>
 
   <script type="module">
-import '../../polymer-legacy.js';
 
 suite('custom-style scope cache', function() {
 
diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
index 5efdd3deb2..12b794ff77 100644
--- a/test/unit/custom-style.html
+++ b/test/unit/custom-style.html
@@ -414,7 +414,6 @@
 </script>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './custom-style-import.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 Polymer({
@@ -439,7 +438,6 @@
 </script>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './custom-style-import.js';
 import { updateStyles } from '../../lib/mixins/element-mixin.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
diff --git a/test/unit/dir.html b/test/unit/dir.html
index a266a2550b..8cc907da4c 100644
--- a/test/unit/dir.html
+++ b/test/unit/dir.html
@@ -53,7 +53,6 @@
       </div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import { DirMixin } from '../../lib/mixins/dir-mixin.js';
 import { PolymerElement } from '../../polymer-element.js';
 class XInnerDir extends DirMixin(PolymerElement) {
@@ -87,7 +86,6 @@
       <x-inner-dir></x-inner-dir>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import { DirMixin } from '../../lib/mixins/dir-mixin.js';
 import { PolymerElement } from '../../polymer-element.js';
 class XDir extends DirMixin(PolymerElement) {
@@ -110,7 +108,6 @@
       </style>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import '../../lib/mixins/dir-mixin.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 Polymer({is: 'x-dir-legacy'});
@@ -136,7 +133,6 @@
   </test-fixture>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import '../../lib/mixins/dir-mixin.js';
 import { PolymerElement } from '../../polymer-element.js';
 class OtherElement extends PolymerElement {}
@@ -167,7 +163,6 @@
       </div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import { DirMixin } from '../../lib/mixins/dir-mixin.js';
 import { PolymerElement } from '../../polymer-element.js';
 class XComplicated extends DirMixin(PolymerElement) {
@@ -186,7 +181,6 @@
   </test-fixture>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import '../../lib/mixins/dir-mixin.js';
 function assertComputed(node, expected, property = 'border-top-width') {
   let actual = getComputedStyle(node).getPropertyValue(property).trim();
diff --git a/test/unit/disable-upgrade.html b/test/unit/disable-upgrade.html
index 2c94125613..733bf02871 100644
--- a/test/unit/disable-upgrade.html
+++ b/test/unit/disable-upgrade.html
@@ -33,7 +33,6 @@ <h2 id="element">[[prop]]</h2>
     </template>
 
     <script type="module">
-import '../../polymer-legacy.js';
 import { DisableUpgradeMixin } from '../../lib/mixins/disable-upgrade-mixin.js';
 import { PolymerElement } from '../../polymer-element.js';
 const Disabled = DisableUpgradeMixin(class extends PolymerElement {
@@ -75,7 +74,6 @@ <h2 id="element">[[prop]]</h2>
       </template>
 
       <script type="module">
-import '../../polymer-legacy.js';
 import { DisableUpgradeMixin } from '../../lib/mixins/disable-upgrade-mixin.js';
 import { Class as PolymerClass } from '../../lib/legacy/class.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
@@ -130,7 +128,6 @@ <h2 id="element">[[prop]]</h2>
     </template>
 
     <script type="module">
-import '../../polymer-legacy.js';
 import '../../lib/mixins/disable-upgrade-mixin.js';
 import { PolymerElement } from '../../polymer-element.js';
 class MyElement extends PolymerElement {
@@ -162,7 +159,6 @@ <h2 id="element">[[prop]]</h2>
     </template>
 
     <script type="module">
-import '../../polymer-legacy.js';
 import '../../lib/mixins/disable-upgrade-mixin.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 Polymer({
@@ -181,7 +177,6 @@ <h2 id="element">[[prop]]</h2>
   </dom-module>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import '../../lib/mixins/disable-upgrade-mixin.js';
 suite('disable-upgrade', function() {
   let el;
diff --git a/test/unit/dom-bind.html b/test/unit/dom-bind.html
index 99d1f143c9..5dbe9a9d0d 100644
--- a/test/unit/dom-bind.html
+++ b/test/unit/dom-bind.html
@@ -24,7 +24,6 @@
   </dom-bind>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './dom-bind-elements1.js';
 import './dom-bind-elements2.js';
 /* global earlyDomBind earlyBoundChild declaredXBasic1 declaredXBasic2 declarativeDomBind boundTextDiv container needsHost nonUpgrade*/
@@ -53,7 +52,6 @@
   </dom-bind>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './dom-bind-elements1.js';
 import './dom-bind-elements2.js';
 </script>
@@ -65,7 +63,6 @@
   </div>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './dom-bind-elements1.js';
 import './dom-bind-elements2.js';
 import { DomBind } from '../../lib/elements/dom-bind.js';
diff --git a/test/unit/dom-if.html b/test/unit/dom-if.html
index 385a458dba..66d0f0f974 100644
--- a/test/unit/dom-if.html
+++ b/test/unit/dom-if.html
@@ -83,7 +83,6 @@
   </div>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './dom-if-elements.js';
 </script>
 
@@ -95,7 +94,6 @@
 
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './dom-if-elements.js';
 import { flush } from '../../lib/utils/flush.js';
 /* global configured individual unconfigured1 unconfigured2 inDocumentContainer inDocumentIf structuredContainer structuredDomIf structuredDomBind outerContainer innerContainer shouldBeRemoved toBeRemoved removalContainer nonUpgrade*/
diff --git a/test/unit/dom-repeat.html b/test/unit/dom-repeat.html
index 97faacab72..f5f5980122 100644
--- a/test/unit/dom-repeat.html
+++ b/test/unit/dom-repeat.html
@@ -125,7 +125,6 @@ <h4>x-repeat-chunked</h4>
   </div>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './dom-repeat-elements.js';
 </script>
 
@@ -136,7 +135,6 @@ <h4>x-repeat-chunked</h4>
   </div>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './dom-repeat-elements.js';
 import { flush } from '../../lib/utils/flush.js';
 import { calculateSplices } from '../../lib/utils/array-splice.js';
diff --git a/test/unit/events.html b/test/unit/events.html
index df4fe0e5ca..58afbce772 100644
--- a/test/unit/events.html
+++ b/test/unit/events.html
@@ -22,7 +22,6 @@
 <body>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './events-elements.js';
 import { afterNextRender } from '../../lib/utils/render-status.js';
 suite('Event Listeners', function() {
diff --git a/test/unit/gestures-elements.js b/test/unit/gestures-elements.js
index 8a4f75c448..9030278899 100644
--- a/test/unit/gestures-elements.js
+++ b/test/unit/gestures-elements.js
@@ -7,7 +7,6 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 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
 */
-import '../../polymer-legacy.js';
 
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 import { html } from '../../lib/utils/html-tag.js';
diff --git a/test/unit/gestures.html b/test/unit/gestures.html
index 24969e51c0..47103a4369 100644
--- a/test/unit/gestures.html
+++ b/test/unit/gestures.html
@@ -22,7 +22,6 @@
 <body>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './gestures-elements.js';
 import { afterNextRender } from '../../lib/utils/render-status.js';
 import * as gestures from '../../lib/utils/gestures.js';
diff --git a/test/unit/globals.html b/test/unit/globals.html
index b099e376dc..5d13f3c05e 100644
--- a/test/unit/globals.html
+++ b/test/unit/globals.html
@@ -15,7 +15,6 @@
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
   <script type="module">
-import '../../polymer-legacy.js';
 /* global origOwnProps:true */
 window.origOwnProps = Object.getOwnPropertyNames(window).reduce(function(props, prop) {
   return props[prop] = true && props;
diff --git a/test/unit/html-tag.html b/test/unit/html-tag.html
index c2205a4966..afae4951fa 100644
--- a/test/unit/html-tag.html
+++ b/test/unit/html-tag.html
@@ -18,7 +18,6 @@
 </head>
 <body>
   <script type="module">
-import '../../polymer-legacy.js';
 import { html, htmlLiteral } from '../../lib/utils/html-tag.js';
 import { PolymerElement } from '../../polymer-element.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
diff --git a/test/unit/inheritance.html b/test/unit/inheritance.html
index 493b69cb2d..72756a3314 100644
--- a/test/unit/inheritance.html
+++ b/test/unit/inheritance.html
@@ -39,7 +39,6 @@
     </template>
 
     <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class BaseEl extends PolymerElement {
   static get is() { return 'base-el'; }
@@ -58,7 +57,6 @@
 
   <dom-module id="child-el">
     <script type="module">
-import '../../polymer-legacy.js';
 class ChildEl extends window.BaseEl {
   static get is() { return 'child-el'; }
   static get properties() {
@@ -72,7 +70,6 @@
 
   <dom-module id="grand-child-el">
     <script type="module">
-import '../../polymer-legacy.js';
 class GrandChildEl extends window.ChildEl {
   static get is() { return 'grand-child-el'; }
   static get properties() {
@@ -87,7 +84,6 @@
   <dom-module id="child-el-with-template">
     <template>should ignore this template</template>
     <script type="module">
-import '../../polymer-legacy.js';
 class ChildElWithTemplate extends window.GrandChildEl {
   static get properties() {
     return { bar: { type: String, value: 3 } };
@@ -113,7 +109,6 @@
 
   <dom-module id="parent-element-template-overriding">
     <script type="module">
-import '../../polymer-legacy.js';
 import { html } from '../../lib/utils/html-tag.js';
 import { PolymerElement } from '../../polymer-element.js';
 class ParentElementWithTemplate extends PolymerElement {
@@ -152,7 +147,6 @@
   </test-fixture>
 
   <script type="module">
-import '../../polymer-legacy.js';
 suite('ChildElement extends BaseElement', function() {
   test('child has base properties', function() {
     var f = fixture('basic');
diff --git a/test/unit/logging.html b/test/unit/logging.html
index 58eae3a4f1..d01d008a96 100644
--- a/test/unit/logging.html
+++ b/test/unit/logging.html
@@ -35,7 +35,6 @@
 </script>
   </dom-module>
   <script type="module">
-import '../../polymer-legacy.js';
 import { LegacyElementMixin } from '../../lib/legacy/legacy-element-mixin.js';
 class XMixin extends LegacyElementMixin(HTMLElement) {
   static get is() { return 'x-mixin'; }
diff --git a/test/unit/mixin-behaviors.html b/test/unit/mixin-behaviors.html
index 059f92f920..09ac5b9dc5 100644
--- a/test/unit/mixin-behaviors.html
+++ b/test/unit/mixin-behaviors.html
@@ -18,7 +18,6 @@
 <body>
 
   <script type="module">
-import '../../polymer-legacy.js';
 window.LifeCycleBehavior1 = {
   _calledCreated: 0,
   _calledAttached: 0,
@@ -196,7 +195,6 @@
 
   <dom-module id="single-behavior">
     <script type="module">
-import '../../polymer-legacy.js';
 import { mixinBehaviors } from '../../lib/legacy/class.js';
 import { PolymerElement } from '../../polymer-element.js';
 customElements.define('single-behavior',
@@ -206,7 +204,6 @@
 
   <dom-module id="lifecycle-behavior">
     <script type="module">
-import '../../polymer-legacy.js';
 import { mixinBehaviors } from '../../lib/legacy/class.js';
 import { PolymerElement } from '../../polymer-element.js';
 customElements.define('lifecycle-behavior',
@@ -217,7 +214,6 @@
 
   <dom-module id="multi-behaviors">
     <script type="module">
-import '../../polymer-legacy.js';
 import { mixinBehaviors } from '../../lib/legacy/class.js';
 import { PolymerElement } from '../../polymer-element.js';
 customElements.define('multi-behaviors',
@@ -257,7 +253,6 @@
 
   <dom-module id="nested-behaviors">
     <script type="module">
-import '../../polymer-legacy.js';
 import { mixinBehaviors } from '../../lib/legacy/class.js';
 import { PolymerElement } from '../../polymer-element.js';
 customElements.define('nested-behaviors',
@@ -275,7 +270,6 @@
       <div id="content"></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import { mixinBehaviors } from '../../lib/legacy/class.js';
 import { PolymerElement } from '../../polymer-element.js';
 
diff --git a/test/unit/mixin-utils.html b/test/unit/mixin-utils.html
index 25bf2230c8..5569c1ca51 100644
--- a/test/unit/mixin-utils.html
+++ b/test/unit/mixin-utils.html
@@ -18,7 +18,6 @@
 </head>
 <body>
   <script type="module">
-import '../../polymer-legacy.js';
 import { dedupingMixin } from '../../lib/utils/mixin.js';
 suite('Mixin Utilities', () => {
   suite('Mixin Caching', () => {
diff --git a/test/unit/multi-style.html b/test/unit/multi-style.html
index 941eabb4a3..4a91891dfb 100644
--- a/test/unit/multi-style.html
+++ b/test/unit/multi-style.html
@@ -56,7 +56,6 @@
     </template>
 
     <script type="module">
-import '../../polymer-legacy.js';
 </script>
 
   </dom-module>
diff --git a/test/unit/path-effects.html b/test/unit/path-effects.html
index b212b2b284..468a02fba6 100644
--- a/test/unit/path-effects.html
+++ b/test/unit/path-effects.html
@@ -19,7 +19,6 @@
 <body>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import './path-effects-elements.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 
diff --git a/test/unit/polymer-dom-observeNodes.html b/test/unit/polymer-dom-observeNodes.html
index 400763fb1a..3bdf9a0dc4 100644
--- a/test/unit/polymer-dom-observeNodes.html
+++ b/test/unit/polymer-dom-observeNodes.html
@@ -179,7 +179,6 @@
   <div id="staticDiv"></div>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { dom } from '../../lib/legacy/polymer.dom.js';
 
 suite('observeNodes', function() {
diff --git a/test/unit/polymer-dom.html b/test/unit/polymer-dom.html
index 6912a70647..7862016bf4 100644
--- a/test/unit/polymer-dom.html
+++ b/test/unit/polymer-dom.html
@@ -88,7 +88,6 @@
   </test-fixture>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { dom } from '../../lib/legacy/polymer.dom.js';
 import { useShadow, useNativeCustomElements, useNativeCSSProperties } from '../../lib/utils/settings.js';
 
diff --git a/test/unit/polymer.legacyelement.html b/test/unit/polymer.legacyelement.html
index 64a30caad3..8c7a48cc1b 100644
--- a/test/unit/polymer.legacyelement.html
+++ b/test/unit/polymer.legacyelement.html
@@ -22,7 +22,6 @@
       <div id="content"></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import { LegacyElementMixin } from '../../lib/legacy/legacy-element-mixin.js';
 
 class MyElement extends LegacyElementMixin(HTMLElement) {
@@ -72,7 +71,6 @@
 
   <dom-module id="sub-element">
     <script type="module">
-import '../../polymer-legacy.js';
 
 class SubElement extends window.MyElement {
 
@@ -108,7 +106,6 @@
   </test-fixture>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 import { ElementMixin } from '../../lib/mixins/element-mixin.js';
 import { LegacyElementMixin } from '../../lib/legacy/legacy-element-mixin.js';
diff --git a/test/unit/properties-changed.html b/test/unit/properties-changed.html
index 91d31c1854..4a3072abe2 100644
--- a/test/unit/properties-changed.html
+++ b/test/unit/properties-changed.html
@@ -20,7 +20,6 @@
 <x-foo prop1="a" prop2="b"></x-foo>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { PropertiesChanged } from '../../lib/mixins/properties-changed.js';
 class XFoo extends PropertiesChanged(HTMLElement) {
   static get observedAttributes() {
@@ -79,7 +78,6 @@
 </script>
 
 <script type="module">
-import '../../polymer-legacy.js';
 
 suite('properties-changed', function() {
 
diff --git a/test/unit/property-accessors.html b/test/unit/property-accessors.html
index d9b4cbb823..880fdc2f4a 100644
--- a/test/unit/property-accessors.html
+++ b/test/unit/property-accessors.html
@@ -20,7 +20,6 @@
 <x-foo prop1="a" prop2="b"></x-foo>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { PropertyAccessors } from '../../lib/mixins/property-accessors.js';
 class XFoo extends PropertyAccessors(HTMLElement) {
   static get observedAttributes() {
@@ -40,7 +39,6 @@
 </script>
 
 <script type="module">
-import '../../polymer-legacy.js';
 
 suite('property-accessors', function() {
 
diff --git a/test/unit/property-effects-elements.js b/test/unit/property-effects-elements.js
index 90d9c34286..7986f2a6f7 100644
--- a/test/unit/property-effects-elements.js
+++ b/test/unit/property-effects-elements.js
@@ -7,7 +7,6 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 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
 */
-import '../../polymer-legacy.js';
 
 import { StrictBindingParser } from '../../lib/mixins/strict-binding-parser.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
diff --git a/test/unit/property-effects.html b/test/unit/property-effects.html
index f47bef8a5f..138dddb2f3 100644
--- a/test/unit/property-effects.html
+++ b/test/unit/property-effects.html
@@ -24,7 +24,6 @@
 </dom-repeat>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import './property-effects-elements.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 import { setSanitizeDOMValue, sanitizeDOMValue } from '../../lib/utils/settings.js';
diff --git a/test/unit/ready-attached-order-class.html b/test/unit/ready-attached-order-class.html
index 88236fa3f3..fce1e8ca6b 100644
--- a/test/unit/ready-attached-order-class.html
+++ b/test/unit/ready-attached-order-class.html
@@ -19,7 +19,6 @@
 <body>
 
 <script type="module">
-import '../../polymer-legacy.js';
 window.clearTestLists = function() {
   window.actualAttachedList = [];
   window.actualReadyList = [];
@@ -74,7 +73,6 @@
     x-zot<slot></slot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class El extends window.readyMixin(PolymerElement) {
   static get is() { return 'x-zot'; }
@@ -88,7 +86,6 @@
     <x-zot id="zot"></x-zot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class El extends window.readyMixin(PolymerElement) {
   static get is() { return 'x-bar'; }
@@ -103,7 +100,6 @@
     <x-bar id="bar2"></x-bar>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class El extends window.readyMixin(PolymerElement) {
   static get is() { return 'x-foo'; }
@@ -123,7 +119,6 @@
     <x-foo id="foo"></x-foo>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class El extends window.readyMixin(PolymerElement) {
   static get is() { return 'x-ready'; }
@@ -147,7 +142,6 @@
     </template>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class El extends PolymerElement {
   static get is() { return 'x-templatized'; }
@@ -164,7 +158,6 @@
 </dom-module>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { flush } from '../../lib/utils/flush.js';
 
 suite('ready and attached ordering', function() {
diff --git a/test/unit/ready-attached-order.html b/test/unit/ready-attached-order.html
index 709b5ea0b3..5c006b0cdc 100644
--- a/test/unit/ready-attached-order.html
+++ b/test/unit/ready-attached-order.html
@@ -19,7 +19,6 @@
 <body>
 
 <script type="module">
-import '../../polymer-legacy.js';
 window.clearTestLists = function() {
   window.actualAttachedList = [];
   window.actualReadyList = [];
@@ -142,7 +141,6 @@
 </dom-module>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { flush } from '../../lib/utils/flush.js';
 
 suite('ready and attached ordering', function() {
diff --git a/test/unit/render-status.html b/test/unit/render-status.html
index c1b1273767..5e212f10d4 100644
--- a/test/unit/render-status.html
+++ b/test/unit/render-status.html
@@ -18,7 +18,6 @@
 <body>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { beforeNextRender as beforeNextRender$0, afterNextRender as afterNextRender$0 } from '../../lib/utils/render-status.js';
 import { LegacyElementMixin } from '../../lib/legacy/legacy-element-mixin.js';
 class XFoo extends LegacyElementMixin(HTMLElement) {
@@ -68,7 +67,6 @@
 </script>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { flush } from '../../lib/utils/render-status.js';
 
 suite('render-status', function() {
diff --git a/test/unit/resolveurl.html b/test/unit/resolveurl.html
index 23a228be12..3d6d5deaf7 100644
--- a/test/unit/resolveurl.html
+++ b/test/unit/resolveurl.html
@@ -41,7 +41,6 @@
   </dom-module>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './sub/resolveurl-elements.js';
 import { PolymerElement } from '../../polymer-element.js';
 class XResolve extends PolymerElement {
@@ -52,7 +51,6 @@
 
 
   <script type="module">
-import '../../polymer-legacy.js';
 import './sub/resolveurl-elements.js';
 import { PolymerElement } from '../../polymer-element.js';
 import { setRootPath } from '../../lib/utils/settings.js';
diff --git a/test/unit/shady-dynamic.html b/test/unit/shady-dynamic.html
index dec1d50dcb..638d0306ce 100644
--- a/test/unit/shady-dynamic.html
+++ b/test/unit/shady-dynamic.html
@@ -770,7 +770,6 @@
   }
 </script>
 <script type="module">
-import '../../polymer-legacy.js';
 import { flush } from '../../lib/utils/flush.js';
 import { dom } from '../../lib/legacy/polymer.dom.js';
 
diff --git a/test/unit/shady-events.html b/test/unit/shady-events.html
index 0603c9df0d..c2a967aaf9 100644
--- a/test/unit/shady-events.html
+++ b/test/unit/shady-events.html
@@ -174,7 +174,6 @@
   </test-fixture>
 
 <script type="module">
-import '../../polymer-legacy.js';
 suite('ShadyDOM event patching', function() {
 
   test('events retarget', function() {
diff --git a/test/unit/shady-unscoped-style.html b/test/unit/shady-unscoped-style.html
index abcde732ea..28ef4d0fd9 100644
--- a/test/unit/shady-unscoped-style.html
+++ b/test/unit/shady-unscoped-style.html
@@ -46,7 +46,6 @@
     </template>
 
     <script type="module">
-import '../../polymer-legacy.js';
 import './shady-unscoped-style-import.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 Polymer({
@@ -71,7 +70,6 @@
     </template>
 
     <script type="module">
-import '../../polymer-legacy.js';
 import './shady-unscoped-style-import.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 Polymer({ is: 'my-element2'});
@@ -83,7 +81,6 @@
   <my-element2></my-element2>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import './shady-unscoped-style-import.js';
 suite('shady-unscoped styles', function() {
 
diff --git a/test/unit/styling-cross-scope-apply.html b/test/unit/styling-cross-scope-apply.html
index 0e42a44b53..94c2eecce7 100644
--- a/test/unit/styling-cross-scope-apply.html
+++ b/test/unit/styling-cross-scope-apply.html
@@ -479,7 +479,6 @@
 Polymer({is: 'order-gp'});
 </script>
 <script type="module">
-import '../../polymer-legacy.js';
 import { flush } from '../../lib/utils/flush.js';
 suite('scoped-styling-apply', function() {
   function assertComputed(element, value, property) {
diff --git a/test/unit/styling-cross-scope-unknown-host.html b/test/unit/styling-cross-scope-unknown-host.html
index 446f18487a..6ab572cc81 100644
--- a/test/unit/styling-cross-scope-unknown-host.html
+++ b/test/unit/styling-cross-scope-unknown-host.html
@@ -33,7 +33,6 @@
   </custom-style>
 
   <script type="module">
-import '../../polymer-legacy.js';
 'use strict';
 class UnknownHost extends HTMLElement {
   constructor() {
@@ -85,7 +84,6 @@
   </dom-module>
 
   <script type="module">
-import '../../polymer-legacy.js';
 suite('scoped-styling-unknown-host', function() {
 
   function assertComputed(element, value, pseudo) {
diff --git a/test/unit/styling-cross-scope-var.html b/test/unit/styling-cross-scope-var.html
index 8315cbb950..9fbc95683e 100644
--- a/test/unit/styling-cross-scope-var.html
+++ b/test/unit/styling-cross-scope-var.html
@@ -726,7 +726,6 @@
 </dom-module>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { updateStyles as updateStyles$0 } from '../../lib/mixins/element-mixin.js';
 import { dom } from '../../lib/legacy/polymer.dom.js';
 suite('scoped-styling-var', function() {
diff --git a/test/unit/styling-import.html b/test/unit/styling-import.html
index 8ca146eeed..1cb13ee1eb 100644
--- a/test/unit/styling-import.html
+++ b/test/unit/styling-import.html
@@ -27,7 +27,6 @@
       <div id="three"></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import './styling-import-shared-styles.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 Polymer({ is: 'x-include-module'});
@@ -48,7 +47,6 @@
       <div id="three"></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import './styling-import-shared-styles.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 Polymer({ is: 'x-include-import'});
@@ -66,7 +64,6 @@
       <div id="two"></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import './styling-import-shared-styles.js';
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 Polymer({is: 'x-import-order'});
@@ -75,7 +72,6 @@
 
 
 <script type="module">
-import '../../polymer-legacy.js';
 import './styling-import-shared-styles.js';
 import { flush } from '../../lib/utils/flush.js';
 suite('style-imports', function() {
diff --git a/test/unit/styling-only-with-template.html b/test/unit/styling-only-with-template.html
index 095599b056..e0578b155e 100644
--- a/test/unit/styling-only-with-template.html
+++ b/test/unit/styling-only-with-template.html
@@ -42,7 +42,6 @@
   <dom-repeat><template></template></dom-repeat>
 
   <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class XFoo extends PolymerElement {
   connectedCallback() {
@@ -55,7 +54,6 @@
 </script>
 
   <script type="module">
-import '../../polymer-legacy.js';
 suite('styling-only-template', function () {
 
   function assertComputed(element, value, pseudo) {
diff --git a/test/unit/styling-scoped.html b/test/unit/styling-scoped.html
index 73bc49fb8b..bc3994d72e 100644
--- a/test/unit/styling-scoped.html
+++ b/test/unit/styling-scoped.html
@@ -13,7 +13,6 @@
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
   <script type="module">
-import '../../polymer-legacy.js';
 let define = window.customElements.define;
 let order = [];
 window.customElements.define = function(name, fn, options) {
@@ -595,7 +594,6 @@
   </style>
 </template>
 <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 customElements.define('x-class-no-is', class extends PolymerElement {
   static get template() {
@@ -665,7 +663,6 @@
       </div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class XNestedStyle extends PolymerElement {
   static get is() {return 'x-nested-style';}
@@ -689,7 +686,6 @@
       </style>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class XInterleaved extends PolymerElement {
   static get is() {return 'x-interleaved-styles';}
@@ -703,7 +699,6 @@
     <link rel="import" type="css" href="styling-import-host2.css">
     <template></template>
     <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class XOnlyLink extends PolymerElement {
   static get is() { return 'x-only-link-style'; }
@@ -734,7 +729,6 @@
       <style include="importing-double-shared-style double-shared-style"></style>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 class DoubleSharedStylingElement extends PolymerElement {
   static get is() { return 'double-shared-styling-element'; }
@@ -744,7 +738,6 @@
   </dom-module>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { dom } from '../../lib/legacy/polymer.dom.js';
 import { flush } from '../../lib/utils/flush.js';
 function assertComputed(element, value, property, pseudo) {
diff --git a/test/unit/template-whitespace.html b/test/unit/template-whitespace.html
index 273d9dd228..325e72cdb4 100644
--- a/test/unit/template-whitespace.html
+++ b/test/unit/template-whitespace.html
@@ -149,7 +149,6 @@
 
 
 <script type="module">
-import '../../polymer-legacy.js';
 import { flush } from '../../lib/utils/flush.js';
 
 suite('polymer: template whitespace', function() {
diff --git a/test/unit/templatize.html b/test/unit/templatize.html
index 7b21407f01..3a2f022793 100644
--- a/test/unit/templatize.html
+++ b/test/unit/templatize.html
@@ -22,7 +22,6 @@
 <template id="standalone"><div prop="[[prop]]">[[text]]</div></template>
 
 <script type="module">
-import '../../polymer-legacy.js';
 import './templatize-elements.js';
 import { templatize } from '../../lib/utils/templatize.js';