From f1266845e527c306241679db86a44b6890e1dbc6 Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Thu, 19 Apr 2018 16:27:06 -0700
Subject: [PATCH] Add WCT config used by all tests

---
 test/runner.html                                |  1 +
 test/unit/array-selector.html                   |  1 +
 test/unit/async.html                            |  1 +
 test/unit/attributes.html                       |  1 +
 test/unit/behaviors.html                        |  1 +
 test/unit/case-map.html                         |  1 +
 test/unit/configure.html                        |  1 +
 test/unit/css-parse.html                        |  1 +
 test/unit/custom-style-async.html               |  1 +
 test/unit/custom-style-late.html                |  1 +
 test/unit/custom-style-scope-cache.html         |  1 +
 test/unit/custom-style.html                     |  1 +
 test/unit/debounce.html                         |  1 +
 test/unit/dir.html                              |  1 +
 test/unit/disable-upgrade.html                  | 17 +++++++++--------
 test/unit/dom-bind.html                         |  1 +
 test/unit/dom-if.html                           |  1 +
 test/unit/dom-repeat.html                       |  1 +
 test/unit/dynamic-import.html                   |  1 +
 test/unit/events.html                           |  1 +
 test/unit/flattened-nodes-observer.html         |  1 +
 test/unit/gestures.html                         |  2 +-
 test/unit/globals.html                          |  1 +
 test/unit/html-tag.html                         |  1 +
 test/unit/importHref.html                       |  1 +
 test/unit/inheritance.html                      |  1 +
 test/unit/logging.html                          |  1 +
 test/unit/mixin-behaviors.html                  |  1 +
 test/unit/mixin-utils.html                      |  1 +
 test/unit/multi-style.html                      |  1 +
 test/unit/path-effects.html                     |  1 +
 test/unit/path.html                             |  1 +
 test/unit/polymer-dom-observeNodes.html         |  1 +
 test/unit/polymer-dom.html                      |  1 +
 test/unit/polymer-element-with-apply.html       |  1 +
 test/unit/polymer.element.html                  |  1 +
 test/unit/polymer.legacyelement.html            |  1 +
 ...roperties-mixin-with-property-accessors.html |  1 +
 test/unit/polymer.properties-mixin.html         |  1 +
 test/unit/properties-changed.html               |  1 +
 test/unit/property-accessors.html               |  1 +
 test/unit/property-effects-template.html        |  2 ++
 test/unit/property-effects.html                 |  1 +
 test/unit/ready-attached-order-class.html       |  1 +
 test/unit/ready-attached-order.html             |  1 +
 test/unit/render-status.html                    |  1 +
 test/unit/resolveurl.html                       |  1 +
 test/unit/shady-content.html                    |  1 +
 test/unit/shady-dynamic.html                    |  1 +
 test/unit/shady-events.html                     |  1 +
 test/unit/shady-unscoped-style.html             |  1 +
 test/unit/shady.html                            |  1 +
 test/unit/styling-cross-scope-apply.html        |  1 +
 test/unit/styling-cross-scope-unknown-host.html |  1 +
 test/unit/styling-cross-scope-var.html          |  1 +
 test/unit/styling-import.html                   |  1 +
 test/unit/styling-only-with-template.html       |  1 +
 test/unit/styling-scoped.html                   |  1 +
 test/unit/sub/style-import.js                   |  2 +-
 test/unit/template-stamp.html                   |  1 +
 test/unit/template-whitespace.html              |  1 +
 test/unit/templatize.html                       |  1 +
 test/unit/wct-browser-config.js                 | 12 ++++++++++++
 63 files changed, 83 insertions(+), 10 deletions(-)
 create mode 100644 test/unit/wct-browser-config.js

diff --git a/test/runner.html b/test/runner.html
index a7c87fea5f..39c7723550 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -18,6 +18,7 @@
       }
     }
   </script>
+  <script src="unit/wct-browser-config.js"></script>
   <script src="../../../wct-browser-legacy/browser.js"></script>
 </head>
 <body>
diff --git a/test/unit/array-selector.html b/test/unit/array-selector.html
index 57a61d6a5a..b1fd6cd180 100644
--- a/test/unit/array-selector.html
+++ b/test/unit/array-selector.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="./array-selector-elements.js"></script>
diff --git a/test/unit/async.html b/test/unit/async.html
index 5ab21e49ee..e5085f85da 100644
--- a/test/unit/async.html
+++ b/test/unit/async.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/utils/async.js"></script>
 </head>
diff --git a/test/unit/attributes.html b/test/unit/attributes.html
index f853fca934..f762cd95dc 100644
--- a/test/unit/attributes.html
+++ b/test/unit/attributes.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="./attributes-elements.js"></script>
diff --git a/test/unit/behaviors.html b/test/unit/behaviors.html
index cc47cbb1aa..739c1353eb 100644
--- a/test/unit/behaviors.html
+++ b/test/unit/behaviors.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 <body>
diff --git a/test/unit/case-map.html b/test/unit/case-map.html
index 2581691e97..29f828c87b 100644
--- a/test/unit/case-map.html
+++ b/test/unit/case-map.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/utils/case-map.js"></script>
 </head>
diff --git a/test/unit/configure.html b/test/unit/configure.html
index e2f1bbf005..4e137e30d4 100644
--- a/test/unit/configure.html
+++ b/test/unit/configure.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/css-parse.html b/test/unit/css-parse.html
index 066764fda2..3c92c05a03 100644
--- a/test/unit/css-parse.html
+++ b/test/unit/css-parse.html
@@ -14,6 +14,7 @@
   <meta charset="utf-8">
 
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
 
   <title>css-parse</title>
diff --git a/test/unit/custom-style-async.html b/test/unit/custom-style-async.html
index fc771f8a63..1452b3aa16 100644
--- a/test/unit/custom-style-async.html
+++ b/test/unit/custom-style-async.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 
diff --git a/test/unit/custom-style-late.html b/test/unit/custom-style-late.html
index 183778bc53..1f2ad3c4f2 100644
--- a/test/unit/custom-style-late.html
+++ b/test/unit/custom-style-late.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/custom-style-scope-cache.html b/test/unit/custom-style-scope-cache.html
index 7eec6cda8d..b8c64279c4 100644
--- a/test/unit/custom-style-scope-cache.html
+++ b/test/unit/custom-style-scope-cache.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 
diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
index e0d50ca535..5efdd3deb2 100644
--- a/test/unit/custom-style.html
+++ b/test/unit/custom-style.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="./custom-style-import.js"></script>
diff --git a/test/unit/debounce.html b/test/unit/debounce.html
index e8bbefa32b..34c62a9ff5 100644
--- a/test/unit/debounce.html
+++ b/test/unit/debounce.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/dir.html b/test/unit/dir.html
index 1cab25469f..a266a2550b 100644
--- a/test/unit/dir.html
+++ b/test/unit/dir.html
@@ -11,6 +11,7 @@
 <html dir="rtl">
 <head>
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="../../lib/mixins/dir-mixin.js"></script>
diff --git a/test/unit/disable-upgrade.html b/test/unit/disable-upgrade.html
index 14dd626de4..2c94125613 100644
--- a/test/unit/disable-upgrade.html
+++ b/test/unit/disable-upgrade.html
@@ -11,6 +11,7 @@
 <html dir="rtl">
 <head>
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="../../lib/mixins/disable-upgrade-mixin.js"></script>
@@ -76,18 +77,18 @@ <h2 id="element">[[prop]]</h2>
       <script type="module">
 import '../../polymer-legacy.js';
 import { DisableUpgradeMixin } from '../../lib/mixins/disable-upgrade-mixin.js';
-import { Class as Class$0 } from '../../lib/legacy/class.js';
-import { Polymer as Polymer$0 } from '../../lib/utils/boot.js';
+import { Class as PolymerClass } from '../../lib/legacy/class.js';
+import { Polymer } from '../../lib/legacy/polymer-fn.js';
 
 // enable disable upgrade!
-const polymerClass = Class$0;
+const origPolymerClass = PolymerClass;
 
-export const Class = function(info) {
-  const ctor = polymerClass(info);
+Polymer.Class = function(info) {
+  const ctor = origPolymerClass(info);
   return DisableUpgradeMixin(ctor);
 };
 
-Polymer$0({
+Polymer({
   is: 'x-disabled-legacy',
   properties: {
     prop: {
@@ -103,14 +104,14 @@ <h2 id="element">[[prop]]</h2>
   }
 });
 
-Polymer$0({
+Polymer({
   is: 'x-disabled-legacy-reg1',
   registered() {
     this.hasRegistered = true;
   }
 });
 
-Polymer$0({
+Polymer({
   is: 'x-disabled-legacy-reg2',
   registered() {
     this.hasRegistered = true;
diff --git a/test/unit/dom-bind.html b/test/unit/dom-bind.html
index 1fc1f1d12b..99d1f143c9 100644
--- a/test/unit/dom-bind.html
+++ b/test/unit/dom-bind.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
 </head>
 <body>
diff --git a/test/unit/dom-if.html b/test/unit/dom-if.html
index 2d14b9d432..385a458dba 100644
--- a/test/unit/dom-if.html
+++ b/test/unit/dom-if.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="./dom-if-elements.js"></script>
diff --git a/test/unit/dom-repeat.html b/test/unit/dom-repeat.html
index b4f29715b4..97faacab72 100644
--- a/test/unit/dom-repeat.html
+++ b/test/unit/dom-repeat.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="./dom-repeat-elements.js"></script>
diff --git a/test/unit/dynamic-import.html b/test/unit/dynamic-import.html
index 7c7920d1e1..5135512cec 100644
--- a/test/unit/dynamic-import.html
+++ b/test/unit/dynamic-import.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="./dynamic-imports/dynamic-element.js"></script>
 </head>
diff --git a/test/unit/events.html b/test/unit/events.html
index 777f9f2ab0..df4fe0e5ca 100644
--- a/test/unit/events.html
+++ b/test/unit/events.html
@@ -13,6 +13,7 @@
   <meta charset="UTF-8">
 
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
 
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/flattened-nodes-observer.html b/test/unit/flattened-nodes-observer.html
index 213e131973..798e9a3400 100644
--- a/test/unit/flattened-nodes-observer.html
+++ b/test/unit/flattened-nodes-observer.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-element.js"></script>
   <script type="module" src="../../lib/utils/flattened-nodes-observer.js"></script>
diff --git a/test/unit/gestures.html b/test/unit/gestures.html
index 9bfcfae867..24969e51c0 100644
--- a/test/unit/gestures.html
+++ b/test/unit/gestures.html
@@ -13,8 +13,8 @@
   <meta charset="utf-8">
 
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
-
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="./gestures-elements.js"></script>
 
diff --git a/test/unit/globals.html b/test/unit/globals.html
index cccc63e25d..29155a644f 100644
--- a/test/unit/globals.html
+++ b/test/unit/globals.html
@@ -11,6 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
   <script type="module">
diff --git a/test/unit/html-tag.html b/test/unit/html-tag.html
index 7ad3b9bb35..c2205a4966 100644
--- a/test/unit/html-tag.html
+++ b/test/unit/html-tag.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/importHref.html b/test/unit/importHref.html
index 2661679b34..ab16c5faec 100644
--- a/test/unit/importHref.html
+++ b/test/unit/importHref.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/utils/import-href.js"></script>
 <body>
diff --git a/test/unit/inheritance.html b/test/unit/inheritance.html
index 39f47696c9..493b69cb2d 100644
--- a/test/unit/inheritance.html
+++ b/test/unit/inheritance.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 <body>
diff --git a/test/unit/logging.html b/test/unit/logging.html
index 0d697a260c..93a7b6323d 100644
--- a/test/unit/logging.html
+++ b/test/unit/logging.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/mixin-behaviors.html b/test/unit/mixin-behaviors.html
index 5cd82c900a..e95454f310 100644
--- a/test/unit/mixin-behaviors.html
+++ b/test/unit/mixin-behaviors.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 <body>
diff --git a/test/unit/mixin-utils.html b/test/unit/mixin-utils.html
index d5241e4a22..25bf2230c8 100644
--- a/test/unit/mixin-utils.html
+++ b/test/unit/mixin-utils.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/multi-style.html b/test/unit/multi-style.html
index dddc182680..c7ccc02812 100644
--- a/test/unit/multi-style.html
+++ b/test/unit/multi-style.html
@@ -10,6 +10,7 @@
 -->
 <html>
 <head>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/path-effects.html b/test/unit/path-effects.html
index cb986c1320..b212b2b284 100644
--- a/test/unit/path-effects.html
+++ b/test/unit/path-effects.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="./path-effects-elements.js"></script>
diff --git a/test/unit/path.html b/test/unit/path.html
index 088ba8fc16..d167fed34c 100644
--- a/test/unit/path.html
+++ b/test/unit/path.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/utils/path.js"></script>
 </head>
diff --git a/test/unit/polymer-dom-observeNodes.html b/test/unit/polymer-dom-observeNodes.html
index 4850cddd0a..d3c4a4f369 100644
--- a/test/unit/polymer-dom-observeNodes.html
+++ b/test/unit/polymer-dom-observeNodes.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/polymer-dom.html b/test/unit/polymer-dom.html
index 379f960310..2359e0eacc 100644
--- a/test/unit/polymer-dom.html
+++ b/test/unit/polymer-dom.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/polymer-element-with-apply.html b/test/unit/polymer-element-with-apply.html
index bebf066da6..6f91613f6f 100644
--- a/test/unit/polymer-element-with-apply.html
+++ b/test/unit/polymer-element-with-apply.html
@@ -11,6 +11,7 @@
 <html>
 <head>
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="./polymer-element-with-apply-import.js"></script>
 </head>
diff --git a/test/unit/polymer.element.html b/test/unit/polymer.element.html
index b342ccfbdf..8bfc154b02 100644
--- a/test/unit/polymer.element.html
+++ b/test/unit/polymer.element.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-element.js"></script>
 <body>
diff --git a/test/unit/polymer.legacyelement.html b/test/unit/polymer.legacyelement.html
index 843e9ec4e7..64a30caad3 100644
--- a/test/unit/polymer.legacyelement.html
+++ b/test/unit/polymer.legacyelement.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 <body>
diff --git a/test/unit/polymer.properties-mixin-with-property-accessors.html b/test/unit/polymer.properties-mixin-with-property-accessors.html
index 69f7c2eacc..b547608843 100644
--- a/test/unit/polymer.properties-mixin-with-property-accessors.html
+++ b/test/unit/polymer.properties-mixin-with-property-accessors.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/mixins/properties-mixin.js"></script>
   <script type="module" src="../../lib/mixins/property-accessors.js"></script>
diff --git a/test/unit/polymer.properties-mixin.html b/test/unit/polymer.properties-mixin.html
index db7ce8ac4a..95139ca856 100644
--- a/test/unit/polymer.properties-mixin.html
+++ b/test/unit/polymer.properties-mixin.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/mixins/properties-mixin.js"></script>
   <body>
diff --git a/test/unit/properties-changed.html b/test/unit/properties-changed.html
index 2cd61ba266..91d31c1854 100644
--- a/test/unit/properties-changed.html
+++ b/test/unit/properties-changed.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 <body>
diff --git a/test/unit/property-accessors.html b/test/unit/property-accessors.html
index b86c042ad0..d9b4cbb823 100644
--- a/test/unit/property-accessors.html
+++ b/test/unit/property-accessors.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 <body>
diff --git a/test/unit/property-effects-template.html b/test/unit/property-effects-template.html
index 067fd421db..0ac0a117aa 100644
--- a/test/unit/property-effects-template.html
+++ b/test/unit/property-effects-template.html
@@ -12,6 +12,8 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-element.js"></script>
   <script type="module" src="../../lib/mixins/gesture-event-listeners.js"></script>
diff --git a/test/unit/property-effects.html b/test/unit/property-effects.html
index 4ea25acca2..f47bef8a5f 100644
--- a/test/unit/property-effects.html
+++ b/test/unit/property-effects.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="./property-effects-elements.js"></script>
diff --git a/test/unit/ready-attached-order-class.html b/test/unit/ready-attached-order-class.html
index e60a3d9752..88236fa3f3 100644
--- a/test/unit/ready-attached-order-class.html
+++ b/test/unit/ready-attached-order-class.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/ready-attached-order.html b/test/unit/ready-attached-order.html
index 9815fa31b8..3b670caf4b 100644
--- a/test/unit/ready-attached-order.html
+++ b/test/unit/ready-attached-order.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/render-status.html b/test/unit/render-status.html
index 73d47e5a3b..c1b1273767 100644
--- a/test/unit/render-status.html
+++ b/test/unit/render-status.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 <body>
diff --git a/test/unit/resolveurl.html b/test/unit/resolveurl.html
index 114c873737..23a228be12 100644
--- a/test/unit/resolveurl.html
+++ b/test/unit/resolveurl.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="UTF-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script>
     Polymer = {
diff --git a/test/unit/shady-content.html b/test/unit/shady-content.html
index 9494b76243..1a78a5c605 100644
--- a/test/unit/shady-content.html
+++ b/test/unit/shady-content.html
@@ -21,6 +21,7 @@
     };
   </script>
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/shady-dynamic.html b/test/unit/shady-dynamic.html
index 86441305e8..9a5cdf0f9b 100644
--- a/test/unit/shady-dynamic.html
+++ b/test/unit/shady-dynamic.html
@@ -21,6 +21,7 @@
     };
   </script>
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/shady-events.html b/test/unit/shady-events.html
index 24681d1cca..a0d7149e6e 100644
--- a/test/unit/shady-events.html
+++ b/test/unit/shady-events.html
@@ -20,6 +20,7 @@
   };
 </script>
 <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+<script src="wct-browser-config.js"></script>
 <script src="../../../../wct-browser-legacy/browser.js"></script>
 <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/shady-unscoped-style.html b/test/unit/shady-unscoped-style.html
index 744c837263..abcde732ea 100644
--- a/test/unit/shady-unscoped-style.html
+++ b/test/unit/shady-unscoped-style.html
@@ -11,6 +11,7 @@
 <html>
 <head>
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="./shady-unscoped-style-import.js"></script>
diff --git a/test/unit/shady.html b/test/unit/shady.html
index f3502ab618..c08cb099c9 100644
--- a/test/unit/shady.html
+++ b/test/unit/shady.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js" register="true" shadydom="true"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/styling-cross-scope-apply.html b/test/unit/styling-cross-scope-apply.html
index d749c4a5e4..6536a5d60d 100644
--- a/test/unit/styling-cross-scope-apply.html
+++ b/test/unit/styling-cross-scope-apply.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/styling-cross-scope-unknown-host.html b/test/unit/styling-cross-scope-unknown-host.html
index 9c9cb64b28..b6da6d6607 100644
--- a/test/unit/styling-cross-scope-unknown-host.html
+++ b/test/unit/styling-cross-scope-unknown-host.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/styling-cross-scope-var.html b/test/unit/styling-cross-scope-var.html
index 1f39756769..b880ab37c0 100644
--- a/test/unit/styling-cross-scope-var.html
+++ b/test/unit/styling-cross-scope-var.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <style>
diff --git a/test/unit/styling-import.html b/test/unit/styling-import.html
index 8dc5d648d0..8ca146eeed 100644
--- a/test/unit/styling-import.html
+++ b/test/unit/styling-import.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="./styling-import-shared-styles.js"></script>
diff --git a/test/unit/styling-only-with-template.html b/test/unit/styling-only-with-template.html
index 2261a4194e..095599b056 100644
--- a/test/unit/styling-only-with-template.html
+++ b/test/unit/styling-only-with-template.html
@@ -13,6 +13,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/styling-scoped.html b/test/unit/styling-scoped.html
index b67de4ab27..08f596d099 100644
--- a/test/unit/styling-scoped.html
+++ b/test/unit/styling-scoped.html
@@ -22,6 +22,7 @@
 };
 customElements.defineOrder = order;
 </script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <style>
diff --git a/test/unit/sub/style-import.js b/test/unit/sub/style-import.js
index 95fbcd5fe9..2838fd98e2 100644
--- a/test/unit/sub/style-import.js
+++ b/test/unit/sub/style-import.js
@@ -1,4 +1,4 @@
-import { pathFromUrl } from '../utils/resolve-url.js';
+import { pathFromUrl } from '../../../lib/utils/resolve-url.js';
 
 const $_documentContainer = document.createElement('div');
 $_documentContainer.setAttribute('style', 'display: none;');
diff --git a/test/unit/template-stamp.html b/test/unit/template-stamp.html
index 7e4641b26f..02b1f65bdc 100644
--- a/test/unit/template-stamp.html
+++ b/test/unit/template-stamp.html
@@ -13,6 +13,7 @@
   <meta charset="UTF-8">
 
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
 
   <script type="module" src="../../lib/mixins/template-stamp.js"></script>
diff --git a/test/unit/template-whitespace.html b/test/unit/template-whitespace.html
index 7686d0fd50..fe533cc0f1 100644
--- a/test/unit/template-whitespace.html
+++ b/test/unit/template-whitespace.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
 </head>
diff --git a/test/unit/templatize.html b/test/unit/templatize.html
index 735839cf23..7b21407f01 100644
--- a/test/unit/templatize.html
+++ b/test/unit/templatize.html
@@ -12,6 +12,7 @@
 <head>
   <meta charset="utf-8">
   <script src="../../../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="wct-browser-config.js"></script>
   <script src="../../../../wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
   <script type="module" src="./templatize-elements.js"></script>
diff --git a/test/unit/wct-browser-config.js b/test/unit/wct-browser-config.js
new file mode 100644
index 0000000000..60d5a73f22
--- /dev/null
+++ b/test/unit/wct-browser-config.js
@@ -0,0 +1,12 @@
+window.WCT = {
+  environmentScripts: [
+    'stacky/lib/parsing.js',
+    'stacky/lib/formatting.js',
+    'stacky/lib/normalization.js',
+    'mocha/mocha.js',
+    'chai/chai.js',
+    '@polymer/sinonjs/sinon.js',
+    'accessibility-developer-tools/dist/js/axs_testing.js',
+    '@polymer/test-fixture/test-fixture.js'
+]
+}
\ No newline at end of file