From 91a0c4d50da7df38e2902e29fbec699e34ee892b Mon Sep 17 00:00:00 2001
From: zakorgyula <gyula.zakor@gmail.com>
Date: Mon, 7 Nov 2016 15:06:16 +0100
Subject: [PATCH] Move bluetooth-helper.js

---
 .../tests/mozilla}/bluetooth/bluetooth-helpers.js               | 0
 .../tests/mozilla/bluetooth/connect/connection-succeeds.html    | 2 +-
 .../mozilla/bluetooth/connect/device-goes-out-of-range.html     | 2 +-
 .../tests/mozilla/bluetooth/connect/get-same-gatt-server.html   | 2 +-
 .../mozilla/bluetooth/disconnect/connect-disconnect-twice.html  | 2 +-
 .../tests/mozilla/bluetooth/disconnect/disconnect-once.html     | 2 +-
 .../mozilla/bluetooth/disconnect/disconnect-twice-in-a-row.html | 2 +-
 .../bluetooth/getCharacteristic/blacklisted-characteristic.html | 2 +-
 .../bluetooth/getCharacteristic/characteristic-found.html       | 2 +-
 .../bluetooth/getCharacteristic/characteristic-not-found.html   | 2 +-
 .../bluetooth/getCharacteristic/device-goes-out-of-range.html   | 2 +-
 .../bluetooth/getCharacteristic/disconnect-called-before.html   | 2 +-
 .../bluetooth/getCharacteristic/disconnect-called-during.html   | 2 +-
 .../bluetooth/getCharacteristic/get-same-characteristic.html    | 2 +-
 .../getCharacteristic/invalid-characteristic-name.html          | 2 +-
 .../mozilla/bluetooth/getCharacteristic/service-is-removed.html | 2 +-
 .../blacklisted-characteristics-with-uuid.html                  | 2 +-
 .../getCharacteristics/blacklisted-characteristics.html         | 2 +-
 .../getCharacteristics/characteristics-found-with-uuid.html     | 2 +-
 .../bluetooth/getCharacteristics/characteristics-found.html     | 2 +-
 .../getCharacteristics/characteristics-not-found-with-uuid.html | 2 +-
 .../bluetooth/getCharacteristics/characteristics-not-found.html | 2 +-
 .../bluetooth/getCharacteristics/correct-characteristics.html   | 2 +-
 .../getCharacteristics/device-goes-out-of-range-with-uuid.html  | 2 +-
 .../bluetooth/getCharacteristics/device-goes-out-of-range.html  | 2 +-
 .../getCharacteristics/disconnect-called-before-with-uuid.html  | 2 +-
 .../bluetooth/getCharacteristics/disconnect-called-before.html  | 2 +-
 .../getCharacteristics/disconnect-called-during-with-uuid.html  | 2 +-
 .../bluetooth/getCharacteristics/disconnect-called-during.html  | 2 +-
 .../bluetooth/getCharacteristics/get-same-characteristics.html  | 2 +-
 .../getCharacteristics/invalid-characteristic-name.html         | 2 +-
 .../getCharacteristics/service-is-removed-with-uuid.html        | 2 +-
 .../bluetooth/getCharacteristics/service-is-removed.html        | 2 +-
 .../mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html | 2 +-
 .../bluetooth/getDescriptor/characteristic-is-removed.html      | 2 +-
 .../tests/mozilla/bluetooth/getDescriptor/descriptor-found.html | 2 +-
 .../mozilla/bluetooth/getDescriptor/descriptor-not-found.html   | 2 +-
 .../bluetooth/getDescriptor/device-goes-out-of-range.html       | 2 +-
 .../bluetooth/getDescriptor/disconnect-called-before.html       | 2 +-
 .../bluetooth/getDescriptor/disconnect-called-during.html       | 2 +-
 .../mozilla/bluetooth/getDescriptor/get-same-descriptor.html    | 2 +-
 .../bluetooth/getDescriptor/invalid-descriptor-name.html        | 2 +-
 .../getDescriptors/blacklisted-descriptors-with-uuid.html       | 2 +-
 .../bluetooth/getDescriptors/blacklisted-descriptors.html       | 2 +-
 .../getDescriptors/characteristic-is-removed-with-uuid.html     | 2 +-
 .../bluetooth/getDescriptors/characteristic-is-removed.html     | 2 +-
 .../mozilla/bluetooth/getDescriptors/correct-descriptors.html   | 2 +-
 .../bluetooth/getDescriptors/descriptors-found-with-uuid.html   | 2 +-
 .../mozilla/bluetooth/getDescriptors/descriptors-found.html     | 2 +-
 .../getDescriptors/descriptors-not-found-with-uuid.html         | 2 +-
 .../mozilla/bluetooth/getDescriptors/descriptors-not-found.html | 2 +-
 .../getDescriptors/device-goes-out-of-range-with-uuid.html      | 2 +-
 .../bluetooth/getDescriptors/device-goes-out-of-range.html      | 2 +-
 .../getDescriptors/disconnect-called-before-with-uuid.html      | 2 +-
 .../bluetooth/getDescriptors/disconnect-called-before.html      | 2 +-
 .../getDescriptors/disconnect-called-during-with-uuid.html      | 2 +-
 .../bluetooth/getDescriptors/disconnect-called-during.html      | 2 +-
 .../mozilla/bluetooth/getDescriptors/get-same-descriptors.html  | 2 +-
 .../bluetooth/getDescriptors/invalid-descriptor-name.html       | 2 +-
 .../bluetooth/getPrimaryService/device-goes-out-of-range.html   | 2 +-
 .../bluetooth/getPrimaryService/disconnect-called-before.html   | 2 +-
 .../bluetooth/getPrimaryService/disconnect-called-during.html   | 2 +-
 .../bluetooth/getPrimaryService/disconnected-device.html        | 2 +-
 .../mozilla/bluetooth/getPrimaryService/get-same-service.html   | 2 +-
 .../bluetooth/getPrimaryService/invalid-service-name.html       | 2 +-
 .../getPrimaryService/no-permission-absent-service.html         | 2 +-
 .../getPrimaryService/no-permission-present-service.html        | 2 +-
 .../mozilla/bluetooth/getPrimaryService/service-found.html      | 2 +-
 .../mozilla/bluetooth/getPrimaryService/service-not-found.html  | 2 +-
 .../getPrimaryServices/blacklisted-services-with-uuid.html      | 2 +-
 .../bluetooth/getPrimaryServices/blacklisted-services.html      | 2 +-
 .../mozilla/bluetooth/getPrimaryServices/correct-services.html  | 2 +-
 .../getPrimaryServices/device-goes-out-of-range-with-uuid.html  | 2 +-
 .../bluetooth/getPrimaryServices/device-goes-out-of-range.html  | 2 +-
 .../getPrimaryServices/disconnect-called-before-with-uuid.html  | 2 +-
 .../bluetooth/getPrimaryServices/disconnect-called-before.html  | 2 +-
 .../getPrimaryServices/disconnect-called-during-with-uuid.html  | 2 +-
 .../bluetooth/getPrimaryServices/disconnect-called-during.html  | 2 +-
 .../getPrimaryServices/disconnected-device-with-uuid.html       | 2 +-
 .../bluetooth/getPrimaryServices/disconnected-device.html       | 2 +-
 .../mozilla/bluetooth/getPrimaryServices/get-same-service.html  | 2 +-
 .../bluetooth/getPrimaryServices/invalid-service-name.html      | 2 +-
 .../no-permission-absent-service-with-uuid.html                 | 2 +-
 .../no-permission-present-service-with-uuid.html                | 2 +-
 .../getPrimaryServices/no-permission-present-service.html       | 2 +-
 .../bluetooth/getPrimaryServices/services-found-with-uuid.html  | 2 +-
 .../mozilla/bluetooth/getPrimaryServices/services-found.html    | 2 +-
 .../getPrimaryServices/services-not-found-with-uuid.html        | 2 +-
 .../bluetooth/getPrimaryServices/services-not-found.html        | 2 +-
 .../readValue/characteristic/blacklisted-characteristic.html    | 2 +-
 .../readValue/characteristic/characteristic-is-removed.html     | 2 +-
 .../readValue/characteristic/device-goes-out-of-range.html      | 2 +-
 .../readValue/characteristic/disconnect-called-before.html      | 2 +-
 .../bluetooth/readValue/characteristic/read-succeeds.html       | 2 +-
 .../bluetooth/readValue/characteristic/read-updates-value.html  | 2 +-
 .../bluetooth/readValue/characteristic/service-is-removed.html  | 2 +-
 .../bluetooth/readValue/descriptor/blacklisted-descriptor.html  | 2 +-
 .../readValue/descriptor/characteristic-is-removed.html         | 2 +-
 .../bluetooth/readValue/descriptor/descriptor-is-removed.html   | 2 +-
 .../readValue/descriptor/device-goes-out-of-range.html          | 2 +-
 .../readValue/descriptor/disconnect-called-before.html          | 2 +-
 .../mozilla/bluetooth/readValue/descriptor/read-succeeds.html   | 2 +-
 .../bluetooth/readValue/descriptor/read-updates-value.html      | 2 +-
 .../bluetooth/readValue/descriptor/service-is-removed.html      | 2 +-
 .../bluetooth/requestDevice/accept-all-devices-with-filter.html | 2 +-
 .../mozilla/bluetooth/requestDevice/accept-all-devices.html     | 2 +-
 .../mozilla/bluetooth/requestDevice/adapter-not-present.html    | 2 +-
 .../tests/mozilla/bluetooth/requestDevice/adapter-off.html      | 2 +-
 .../bluetooth/requestDevice/blacklisted-service-in-filter.html  | 2 +-
 .../requestDevice/blacklisted-service-in-optionalServices.html  | 2 +-
 .../requestDevice/canonicalizeFilter/empty-filter.html          | 2 +-
 .../requestDevice/canonicalizeFilter/empty-filters-member.html  | 2 +-
 .../requestDevice/canonicalizeFilter/empty-namePrefix.html      | 2 +-
 .../requestDevice/canonicalizeFilter/empty-services-member.html | 2 +-
 .../canonicalizeFilter/max-length-for-device-name-name.html     | 2 +-
 .../max-length-for-device-name-namePrefix.html                  | 2 +-
 .../canonicalizeFilter/max-length-for-name-in-adv-name.html     | 2 +-
 .../max-length-for-name-in-adv-namePrefix.html                  | 2 +-
 .../requestDevice/canonicalizeFilter/no-arguments.html          | 2 +-
 .../requestDevice/canonicalizeFilter/no-filters-member.html     | 2 +-
 .../unicode-max-length-for-device-name-name.html                | 2 +-
 .../unicode-max-length-for-device-name-namePrefix.html          | 2 +-
 .../unicode-max-length-for-name-in-adv-name.html                | 2 +-
 .../unicode-max-length-for-name-in-adv-namePrefix.html          | 2 +-
 .../canonicalizeFilter/unicode-valid-length-name-name.html      | 2 +-
 .../unicode-valid-length-name-namePrefix.html                   | 2 +-
 .../wrong-service-in-optionalServices-member.html               | 2 +-
 .../canonicalizeFilter/wrong-service-in-services-member.html    | 2 +-
 .../mozilla/bluetooth/requestDevice/discovery-succeeds.html     | 2 +-
 .../mozilla/bluetooth/requestDevice/filter-does-not-match.html  | 2 +-
 .../tests/mozilla/bluetooth/requestDevice/filter-matches.html   | 2 +-
 .../requestDevice/name-empty-device-from-name-empty-filter.html | 2 +-
 .../name-empty-device-from-name-prefix-filter.html              | 2 +-
 .../requestDevice/name-empty-device-from-name-wrong-filter.html | 2 +-
 .../requestDevice/name-empty-device-from-service-filter.html    | 2 +-
 .../mozilla/bluetooth/requestDevice/name-empty-filter.html      | 2 +-
 .../name-missing-device-from-name-empty-filter.html             | 2 +-
 .../name-missing-device-from-name-prefix-filter.html            | 2 +-
 .../name-missing-device-from-name-wrong-filter.html             | 2 +-
 .../requestDevice/name-missing-device-from-service-filter.html  | 2 +-
 .../tests/mozilla/bluetooth/requestDevice/no-devices.html       | 2 +-
 .../requestDevice/not-accept-all-devices-without-filter.html    | 2 +-
 .../tests/mozilla/bluetooth/requestDevice/same-device.html      | 2 +-
 .../bluetooth/requestDevice/single-filter-single-service.html   | 2 +-
 .../requestDevice/single-filter-two-services-fails.html         | 2 +-
 .../requestDevice/single-filter-two-services-succeeds.html      | 2 +-
 .../tests/mozilla/bluetooth/requestDevice/two-filters.html      | 2 +-
 .../writeValue/characteristic/blacklisted-characteristic.html   | 2 +-
 .../writeValue/characteristic/characteristic-is-removed.html    | 2 +-
 .../writeValue/characteristic/device-goes-out-of-range.html     | 2 +-
 .../writeValue/characteristic/disconnect-called-before.html     | 2 +-
 .../bluetooth/writeValue/characteristic/service-is-removed.html | 2 +-
 .../bluetooth/writeValue/characteristic/write-succeeds.html     | 2 +-
 .../writeValue/characteristic/write-updates-value.html          | 2 +-
 .../bluetooth/writeValue/descriptor/blacklisted-descriptor.html | 2 +-
 .../writeValue/descriptor/characteristic-is-removed.html        | 2 +-
 .../bluetooth/writeValue/descriptor/descriptor-is-removed.html  | 2 +-
 .../writeValue/descriptor/device-goes-out-of-range.html         | 2 +-
 .../writeValue/descriptor/disconnect-called-before.html         | 2 +-
 .../bluetooth/writeValue/descriptor/service-is-removed.html     | 2 +-
 .../mozilla/bluetooth/writeValue/descriptor/write-succeeds.html | 2 +-
 .../bluetooth/writeValue/descriptor/write-updates-value.html    | 2 +-
 162 files changed, 161 insertions(+), 161 deletions(-)
 rename tests/wpt/{web-platform-tests => mozilla/tests/mozilla}/bluetooth/bluetooth-helpers.js (100%)

diff --git a/tests/wpt/web-platform-tests/bluetooth/bluetooth-helpers.js b/tests/wpt/mozilla/tests/mozilla/bluetooth/bluetooth-helpers.js
similarity index 100%
rename from tests/wpt/web-platform-tests/bluetooth/bluetooth-helpers.js
rename to tests/wpt/mozilla/tests/mozilla/bluetooth/bluetooth-helpers.js
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/connection-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/connection-succeeds.html
index 34747ba93a6..3103ca4ff65 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/connection-succeeds.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/connection-succeeds.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/device-goes-out-of-range.html
index 063bcb6b009..f189a9971f2 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/device-goes-out-of-range.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/device-goes-out-of-range.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/get-same-gatt-server.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/get-same-gatt-server.html
index 85dab11927f..8572fd86e37 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/get-same-gatt-server.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/get-same-gatt-server.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/connect-disconnect-twice.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/connect-disconnect-twice.html
index 51cac67b626..fd60327fa64 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/connect-disconnect-twice.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/connect-disconnect-twice.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-once.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-once.html
index 1e13b354d7b..17a17718655 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-once.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-once.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-twice-in-a-row.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-twice-in-a-row.html
index 0fa63704779..d42fed6ce46 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-twice-in-a-row.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-twice-in-a-row.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html
index 131c7fa3afd..e3e207af9a1 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-found.html
index 10754eaad3d..d0d914cccbc 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-not-found.html
index a7360567a22..a65ca1bd077 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-not-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-not-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/device-goes-out-of-range.html
index 87491e03439..e826bd6a0c9 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/device-goes-out-of-range.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/device-goes-out-of-range.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html
index 63f00e2c6c8..58900dd6157 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-during.html
index 983c191b616..13ecf55d2b4 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-during.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-during.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html
index f749e8e2ccb..ded15a8810e 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/invalid-characteristic-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/invalid-characteristic-name.html
index 418603ea43d..46c46938127 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/invalid-characteristic-name.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/invalid-characteristic-name.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/service-is-removed.html
index 9a10c745ab4..7b77ac64c5f 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/service-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/service-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html
index 9957fa98b31..fbb73f15cfa 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html
index f4701ac77ca..84ddb24bff8 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found-with-uuid.html
index d078623642f..acea079cc9b 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found.html
index d50e8e44921..3cc5ee4791c 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found-with-uuid.html
index 9c4f0bcd310..48e0f3dffdf 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found.html
index 029d20c48da..4df6cf24d62 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/correct-characteristics.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/correct-characteristics.html
index f3a1f88649f..097bfb85196 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/correct-characteristics.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/correct-characteristics.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range-with-uuid.html
index 735e2c63a95..76d102c081d 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range.html
index b852d85f492..ffb825bceb2 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html
index 02f3cace850..381be5bab68 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html
index a4462a8a8ae..446b9e9f92e 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during-with-uuid.html
index f54500fa844..5750034d0a5 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during.html
index 9905336ec64..e32d601a12f 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html
index 4911bce432c..713ebf15e31 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/invalid-characteristic-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/invalid-characteristic-name.html
index ea960f6af10..00820d06f37 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/invalid-characteristic-name.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/invalid-characteristic-name.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html
index d6a4e546e7f..524309694f7 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed.html
index 1847acf7db4..94f71584ce7 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html
index 69487ee04a4..f3a0260c115 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html
index 7af5169917c..4989a8bec84 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-found.html
index 4ae4ec1f93f..bcd39dd6874 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-not-found.html
index ac1673956a1..25d69ec131e 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-not-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-not-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/device-goes-out-of-range.html
index f766aab8a04..cfaa3fc1e6c 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/device-goes-out-of-range.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/device-goes-out-of-range.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-before.html
index da515ef859c..f6b5bdb6238 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-before.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-before.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-during.html
index 812d506a9ff..b0d38d06222 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-during.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-during.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/get-same-descriptor.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/get-same-descriptor.html
index 9a64c293309..fdb00d8c419 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/get-same-descriptor.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/get-same-descriptor.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/invalid-descriptor-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/invalid-descriptor-name.html
index c2b29c3fc99..1a56b8e6a15 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/invalid-descriptor-name.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/invalid-descriptor-name.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html
index 5798594c9fb..67e51e56800 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html
index 7859376a64c..790ab94f56a 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html
index ca343b558b0..e3794118465 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html
index 37d549da975..59ccf3cbcf1 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/correct-descriptors.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/correct-descriptors.html
index 99742f1c74b..315ef3a1e62 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/correct-descriptors.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/correct-descriptors.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found-with-uuid.html
index 77066e1af4e..2df06d990b3 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found.html
index 537b7da3c20..a0cf577397e 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found-with-uuid.html
index 7a1aff27fd1..ad440b9cbdf 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found.html
index dd1f7937459..03d4ccc976c 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range-with-uuid.html
index 3e4b5cc7a75..ba390afb50a 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range.html
index 4f62af9447c..6b3477302ab 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html
index f3ae8ba674b..1cc47946613 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before.html
index a18710484cd..bb7852a4a9f 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during-with-uuid.html
index 7994b46d281..e3b52e9d806 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during.html
index 67f8394b9f8..1bb4094a168 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/get-same-descriptors.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/get-same-descriptors.html
index b0f761c5dff..b91b63e2eb4 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/get-same-descriptors.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/get-same-descriptors.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/invalid-descriptor-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/invalid-descriptor-name.html
index 573bf7627c0..ddcc08c04bd 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/invalid-descriptor-name.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/invalid-descriptor-name.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/device-goes-out-of-range.html
index 0de62861621..a26e9b5ec41 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/device-goes-out-of-range.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/device-goes-out-of-range.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html
index f13e494febe..d5b0691471f 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-during.html
index 35463ca94e3..e7f43994a5a 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-during.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-during.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnected-device.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnected-device.html
index 4de7ea326c2..917a81c409e 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnected-device.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnected-device.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/get-same-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/get-same-service.html
index 752b929a845..e6bbe4c6b65 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/get-same-service.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/get-same-service.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/invalid-service-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/invalid-service-name.html
index a4406338c39..f23f0201951 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/invalid-service-name.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/invalid-service-name.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-absent-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-absent-service.html
index bb431828536..1076da99b39 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-absent-service.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-absent-service.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-present-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-present-service.html
index 63a22fc519b..e889d07fcc7 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-present-service.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-present-service.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-found.html
index a9656dcbc47..f5f9982d401 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-not-found.html
index 6009f09a5fd..baeceb4d4e6 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-not-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-not-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html
index 988b6dea840..9fa4d4c5921 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html
index f5e0317e7be..1b72a2951c9 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/correct-services.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/correct-services.html
index 3b14e7e257f..3ac25687ace 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/correct-services.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/correct-services.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range-with-uuid.html
index cb001e7366d..bbe01b2a4e5 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range.html
index 068c38ecdeb..a0a3e0b4306 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html
index 05db5f52c54..325ded0c35e 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html
index 87d8a362eeb..8ce84108aee 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during-with-uuid.html
index 9b43949f924..076e72741de 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during.html
index 229e4de7f40..bfcdd886c06 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html
index 54bb8f6ac14..d97698bc2d3 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device.html
index 37700135f81..f63aff631fe 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/get-same-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/get-same-service.html
index 889951315e0..762dcfd1327 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/get-same-service.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/get-same-service.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/invalid-service-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/invalid-service-name.html
index dfae1d89a2b..a558b6cedfd 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/invalid-service-name.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/invalid-service-name.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-absent-service-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-absent-service-with-uuid.html
index 6f23bb9217b..ebcacc95864 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-absent-service-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-absent-service-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service-with-uuid.html
index 9ed16d2a3a0..f303402cdcc 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html
index d56f7b4e167..d7cab72de16 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found-with-uuid.html
index 7b262688706..e52c949843b 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found.html
index d5286126f27..bf67e6e21ca 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found-with-uuid.html
index 42ebb2c48a6..6e92ee43c0d 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found-with-uuid.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found-with-uuid.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found.html
index d7be5d8d005..84e83604300 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html
index fda94bf4f1f..0ab27a51651 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html
index 235a1252689..5443ec85518 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/device-goes-out-of-range.html
index c122101ab0f..bfdedbc246c 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/device-goes-out-of-range.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/device-goes-out-of-range.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/disconnect-called-before.html
index b3bfcb71726..104843dd11c 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/disconnect-called-before.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/disconnect-called-before.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-succeeds.html
index 47c67838856..fb69e8de416 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-succeeds.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-succeeds.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-updates-value.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-updates-value.html
index e9ccdc037a8..168573c75cd 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-updates-value.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-updates-value.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/service-is-removed.html
index de072c5309e..e75735a42cd 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/service-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/service-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html
index a64633ed004..e407be84240 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html
index 6914f6950de..81e5ba10c2c 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html
index cbd91f011b5..66cf6498a5c 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/device-goes-out-of-range.html
index ab300b2249a..6eac0e4fbf3 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/device-goes-out-of-range.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/device-goes-out-of-range.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/disconnect-called-before.html
index 5641a22aa9e..d9736243bf4 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/disconnect-called-before.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/disconnect-called-before.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-succeeds.html
index 1b810c67983..f5977262492 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-succeeds.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-succeeds.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-updates-value.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-updates-value.html
index 376cde92168..150b870d770 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-updates-value.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-updates-value.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/service-is-removed.html
index fb0d1f95ff5..77cd08043b9 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/service-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/service-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices-with-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices-with-filter.html
index e8eba04ae8f..f47cc3beaa9 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices-with-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices-with-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices.html
index 0c2e16db957..66d23a43469 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-not-present.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-not-present.html
index 9f5a419bad5..6cc77fde5c9 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-not-present.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-not-present.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-off.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-off.html
index 06e7d804856..565d59ddbc9 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-off.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-off.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html
index 73ba18855e2..6a91eb3b5fe 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html
index a1ef467cd11..33395cc9636 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filter.html
index e78165b2d75..9ba02650308 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.html
index 4acfedef2bf..34633ba4d75 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.html
index b296fe7a29a..21ee2ee221b 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.html
index 9176cc76626..e3f10eb25fe 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-name.html
index 9b35a48ac92..6ea752cdb45 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-name.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-name.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-namePrefix.html
index c2321712ced..cc92a3cc53b 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-namePrefix.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-namePrefix.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html
index 7ea0dafa53e..246a43a4a0d 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html
index 7b8d7ced422..3f737f48748 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html
index 3e59141ad09..107614c557f 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html
index 0763557d308..7aa27067133 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-name.html
index 3a5ca1fe042..3327ffab534 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-name.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-name.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-namePrefix.html
index 978d58e8de3..65d5fa0fa7a 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-namePrefix.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-namePrefix.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html
index f32a26929d6..84f564efbfd 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html
index 46a0c8072ae..d96664c337c 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.html
index 6bead355297..5c004713b5e 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.html
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.html
index e02e4b3a19c..088b3781861 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.html
index dd6a5d7317e..752f6765a2e 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 
 let test_specs = [{
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.html
index cb84b955fa2..cf249d87e19 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 
 let test_specs = [{
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/discovery-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/discovery-succeeds.html
index bb5b669c431..6ee528fbe1f 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/discovery-succeeds.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/discovery-succeeds.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-does-not-match.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-does-not-match.html
index d9066068a1f..a82d1196966 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-does-not-match.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-does-not-match.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 let matching_services = [heart_rate.uuid];
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-matches.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-matches.html
index f137d541fdf..c986a40d4ed 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-matches.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-matches.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html
index 5fc093ba4e9..3f6a7748535 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-prefix-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-prefix-filter.html
index 553d5cf8367..4d546668961 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-prefix-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-prefix-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-wrong-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-wrong-filter.html
index 17454b7a40a..f930bd4662d 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-wrong-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-wrong-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-service-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-service-filter.html
index 0c8ad3eff6d..d1791204055 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-service-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-service-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-filter.html
index 85e9c94a59f..8ac94f17558 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html
index 8477b5a1da9..12e2deea0b9 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-prefix-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-prefix-filter.html
index e34fa4fa9ff..4cc36f3d569 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-prefix-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-prefix-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-wrong-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-wrong-filter.html
index 1686d48f132..528707e2379 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-wrong-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-wrong-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-service-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-service-filter.html
index 1073fc5f465..7f228de9ce3 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-service-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-service-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/no-devices.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/no-devices.html
index 5ef8848b9b2..75f14073a34 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/no-devices.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/no-devices.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/not-accept-all-devices-without-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/not-accept-all-devices-without-filter.html
index 013432047ad..d4a7dc37314 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/not-accept-all-devices-without-filter.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/not-accept-all-devices-without-filter.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/same-device.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/same-device.html
index ead68342ee9..949db7f453f 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/same-device.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/same-device.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-single-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-single-service.html
index 10ffd492447..e74bbd92054 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-single-service.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-single-service.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-fails.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-fails.html
index 5c49545d14f..eabc7250e08 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-fails.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-fails.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-succeeds.html
index 3da018861c5..9cac9e48ed0 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-succeeds.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-succeeds.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/two-filters.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/two-filters.html
index c5dd766f898..e6097442df3 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/two-filters.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/two-filters.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html
index cd591ccd056..4c7ffa8c2e3 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html
index 35d002c07c1..c4ff0d6ce17 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/device-goes-out-of-range.html
index 45a3076ae91..05d365554eb 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/device-goes-out-of-range.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/device-goes-out-of-range.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/disconnect-called-before.html
index 1ebe8ca7696..bb8536f363f 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/disconnect-called-before.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/disconnect-called-before.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html
index f51bfe44a4e..5034dae1eb1 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-succeeds.html
index 0344c2c2d21..f87d4c9d8ce 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-succeeds.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-succeeds.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html
index d49dc2933c3..eaf5fb9f7d3 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html
index 709053449a9..26896704df0 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html
index 0ab4aa51a14..d8c9ac417a7 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html
index 68e48930a72..f52fa78ccf5 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/device-goes-out-of-range.html
index 6bae889ac15..9ec7e5218e2 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/device-goes-out-of-range.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/device-goes-out-of-range.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/disconnect-called-before.html
index 939f9e4be36..30cd957a23f 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/disconnect-called-before.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/disconnect-called-before.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html
index 36d38d44d2c..284e6fee6e0 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-succeeds.html
index 9a0c3c66127..61afdd2a2dc 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-succeeds.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-succeeds.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(t => {
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html
index 9fb5adf749d..ee6f028b5dc 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/bluetooth/bluetooth-helpers.js"></script>
+<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 promise_test(() => {