diff --git a/accelerometer/Accelerometer-disabled-by-feature-policy.https.html b/accelerometer/Accelerometer-disabled-by-feature-policy.https.html
index 9481f30f6b794a..9476efb6a0f18e 100644
--- a/accelerometer/Accelerometer-disabled-by-feature-policy.https.html
+++ b/accelerometer/Accelerometer-disabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index 809fe0b3d797c2..aa8ea10eb0b0f8 100644
--- a/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html b/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html
index 3f53de061a1a4c..860a027b55bcc2 100644
--- a/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html
+++ b/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/accelerometer/Accelerometer-enabled-by-feature-policy.https.html b/accelerometer/Accelerometer-enabled-by-feature-policy.https.html
index dca391bab0f1e0..889047a0703eca 100644
--- a/accelerometer/Accelerometer-enabled-by-feature-policy.https.html
+++ b/accelerometer/Accelerometer-enabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html b/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html
index cc05a387a5b0e6..bf458529e84920 100644
--- a/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html
+++ b/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/accelerometer/Accelerometer.https.html b/accelerometer/Accelerometer.https.html
index 73c579c35b5df2..9563270fcda554 100644
--- a/accelerometer/Accelerometer.https.html
+++ b/accelerometer/Accelerometer.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/accelerometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <script>
 
diff --git a/accelerometer/Accelerometer_insecure_context.html b/accelerometer/Accelerometer_insecure_context.html
index 81b33dd514bc68..ff1f0832c31088 100644
--- a/accelerometer/Accelerometer_insecure_context.html
+++ b/accelerometer/Accelerometer_insecure_context.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/accelerometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Note:</h2>
 <ol>
diff --git a/accelerometer/Accelerometer_onerror-manual.https.html b/accelerometer/Accelerometer_onerror-manual.https.html
index ed5f190a715c41..f69b1b6ce5c119 100644
--- a/accelerometer/Accelerometer_onerror-manual.https.html
+++ b/accelerometer/Accelerometer_onerror-manual.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/accelerometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
diff --git a/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html b/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html
index e586a0e12117ef..3525320e256a16 100644
--- a/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html
+++ b/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index 33112cfe3d2859..84bee55718680f 100644
--- a/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html b/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html
index 41a7f9a8a54d52..a9810128956f26 100644
--- a/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html
+++ b/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html b/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html
index d2cc12680db9bd..e4ce2566bf07f5 100644
--- a/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html
+++ b/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html b/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html
index 7f5267d3a83c02..bb2c4a61841193 100644
--- a/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html
+++ b/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/ambient-light/AmbientLightSensor.https.html b/ambient-light/AmbientLightSensor.https.html
index c45c7bcfa59c3f..88bb19a96ce91b 100644
--- a/ambient-light/AmbientLightSensor.https.html
+++ b/ambient-light/AmbientLightSensor.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/ambient-light/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <script>
 
diff --git a/ambient-light/AmbientLightSensor_insecure_context.html b/ambient-light/AmbientLightSensor_insecure_context.html
index 1b51ded1d39fed..9a7c91492b58d8 100644
--- a/ambient-light/AmbientLightSensor_insecure_context.html
+++ b/ambient-light/AmbientLightSensor_insecure_context.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/ambient-light/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
diff --git a/ambient-light/AmbientLightSensor_onerror-manual.https.html b/ambient-light/AmbientLightSensor_onerror-manual.https.html
index 130f821da3e77a..8bcb9082cc9daa 100644
--- a/ambient-light/AmbientLightSensor_onerror-manual.https.html
+++ b/ambient-light/AmbientLightSensor_onerror-manual.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/ambient-light/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
diff --git a/sensors/OWNERS b/generic-sensor/OWNERS
similarity index 100%
rename from sensors/OWNERS
rename to generic-sensor/OWNERS
diff --git a/sensors/SensorErrorEvent-constructor.https.html b/generic-sensor/SensorErrorEvent-constructor.https.html
similarity index 100%
rename from sensors/SensorErrorEvent-constructor.https.html
rename to generic-sensor/SensorErrorEvent-constructor.https.html
diff --git a/sensors/generic-sensor-feature-policy-test.sub.js b/generic-sensor/generic-sensor-feature-policy-test.sub.js
similarity index 100%
rename from sensors/generic-sensor-feature-policy-test.sub.js
rename to generic-sensor/generic-sensor-feature-policy-test.sub.js
diff --git a/sensors/generic-sensor-tests.js b/generic-sensor/generic-sensor-tests.js
similarity index 100%
rename from sensors/generic-sensor-tests.js
rename to generic-sensor/generic-sensor-tests.js
diff --git a/sensors/idlharness.https.html b/generic-sensor/idlharness.https.html
similarity index 100%
rename from sensors/idlharness.https.html
rename to generic-sensor/idlharness.https.html
diff --git a/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html b/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html
index 976d42731d1c80..88f92c6539930b 100644
--- a/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html
+++ b/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index 45ee97f9347e99..66b7832e45fa93 100644
--- a/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html b/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html
index b4790575bb0c0d..5ea2518af63825 100644
--- a/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html
+++ b/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html b/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html
index 08d45f2c6265d0..46ef9b7ce8622a 100644
--- a/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html
+++ b/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html b/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html
index 651d31cc85fcde..1694ed00fdfe46 100644
--- a/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html
+++ b/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/geolocation-sensor/GeolocationSensor.https.html b/geolocation-sensor/GeolocationSensor.https.html
index 3319c02807a67f..625963870f6e42 100644
--- a/geolocation-sensor/GeolocationSensor.https.html
+++ b/geolocation-sensor/GeolocationSensor.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://wicg.github.io/geolocation-sensor/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <script>
 
 runGenericSensorTests(GeolocationSensor);
diff --git a/geolocation-sensor/GeolocationSensor_insecure_context.html b/geolocation-sensor/GeolocationSensor_insecure_context.html
index 6e487cb2b5d9a4..6a3a126c7850f4 100644
--- a/geolocation-sensor/GeolocationSensor_insecure_context.html
+++ b/geolocation-sensor/GeolocationSensor_insecure_context.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://wicg.github.io/geolocation-sensor/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <script>
 
 runGenericSensorInsecureContext("GeolocationSensor");
diff --git a/geolocation-sensor/GeolocationSensor_onerror-manual.https.html b/geolocation-sensor/GeolocationSensor_onerror-manual.https.html
index 00d1135bbdcca2..b449346546fc2e 100644
--- a/geolocation-sensor/GeolocationSensor_onerror-manual.https.html
+++ b/geolocation-sensor/GeolocationSensor_onerror-manual.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://wicg.github.io/geolocation-sensor/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <h2>Precondition</h2>
 <ol>
   <li>
diff --git a/gyroscope/Gyroscope-disabled-by-feature-policy.https.html b/gyroscope/Gyroscope-disabled-by-feature-policy.https.html
index 5ab2fb44147262..de4aee2dacc887 100644
--- a/gyroscope/Gyroscope-disabled-by-feature-policy.https.html
+++ b/gyroscope/Gyroscope-disabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index 26c5edfa7a631b..3c831bb7c7ee2b 100644
--- a/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html b/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html
index e76571d60541e7..46473c3a9d0319 100644
--- a/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html
+++ b/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/gyroscope/Gyroscope-enabled-by-feature-policy.https.html b/gyroscope/Gyroscope-enabled-by-feature-policy.https.html
index d21bd072411ab2..95eee330b39470 100644
--- a/gyroscope/Gyroscope-enabled-by-feature-policy.https.html
+++ b/gyroscope/Gyroscope-enabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html b/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html
index 9626e60e339721..ae5a63d1484394 100644
--- a/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html
+++ b/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/gyroscope/Gyroscope.https.html b/gyroscope/Gyroscope.https.html
index 8f035222d3cd70..81cdfddee7baa3 100644
--- a/gyroscope/Gyroscope.https.html
+++ b/gyroscope/Gyroscope.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/gyroscope/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <script>
 
diff --git a/gyroscope/Gyroscope_insecure_context.html b/gyroscope/Gyroscope_insecure_context.html
index e821db00885e0a..2ae8117d708778 100644
--- a/gyroscope/Gyroscope_insecure_context.html
+++ b/gyroscope/Gyroscope_insecure_context.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/gyroscope/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
diff --git a/gyroscope/Gyroscope_onerror-manual.https.html b/gyroscope/Gyroscope_onerror-manual.https.html
index cf330cae0dc929..f0126151a24a59 100644
--- a/gyroscope/Gyroscope_onerror-manual.https.html
+++ b/gyroscope/Gyroscope_onerror-manual.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/gyroscope/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
diff --git a/magnetometer/Magnetometer-disabled-by-feature-policy.https.html b/magnetometer/Magnetometer-disabled-by-feature-policy.https.html
index 3d861c156e2a03..56a1cc4f0f9453 100644
--- a/magnetometer/Magnetometer-disabled-by-feature-policy.https.html
+++ b/magnetometer/Magnetometer-disabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index f63768191d83e9..b5f6798e248598 100644
--- a/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html b/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html
index 31f83f1edaa4eb..6cad267b6f54b2 100644
--- a/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html
+++ b/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/magnetometer/Magnetometer-enabled-by-feature-policy.https.html b/magnetometer/Magnetometer-enabled-by-feature-policy.https.html
index 83e08ebf2ac513..24e2554bca29b0 100644
--- a/magnetometer/Magnetometer-enabled-by-feature-policy.https.html
+++ b/magnetometer/Magnetometer-enabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html b/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html
index feb8fecdea75db..59dfef5bf20670 100644
--- a/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html
+++ b/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/magnetometer/Magnetometer.https.html b/magnetometer/Magnetometer.https.html
index 496c5281c48660..a3cefc26169fac 100644
--- a/magnetometer/Magnetometer.https.html
+++ b/magnetometer/Magnetometer.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/magnetometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <script>
 
diff --git a/magnetometer/Magnetometer_insecure_context.html b/magnetometer/Magnetometer_insecure_context.html
index 7452181914d7a0..45ff584b425d99 100644
--- a/magnetometer/Magnetometer_insecure_context.html
+++ b/magnetometer/Magnetometer_insecure_context.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/magnetometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
diff --git a/magnetometer/Magnetometer_onerror-manual.https.html b/magnetometer/Magnetometer_onerror-manual.https.html
index 0c823d00df9245..04b987797fa6e5 100644
--- a/magnetometer/Magnetometer_onerror-manual.https.html
+++ b/magnetometer/Magnetometer_onerror-manual.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://www.w3.org/TR/magnetometer/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
diff --git a/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html b/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html
index b3e802eeb45032..ccefe2ea23eeef 100644
--- a/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html
+++ b/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index ea416bbbb4f6b8..6aed47d4ddf499 100644
--- a/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html b/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html
index 2fba4878c08b73..51bbba1cae45c7 100644
--- a/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html
+++ b/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html b/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html
index c61c957d9b9b72..c0b4cc8ed30d0f 100644
--- a/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html
+++ b/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html b/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
index 412a8672bfb758..9ce51ab64489d2 100644
--- a/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
+++ b/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/orientation-sensor/OrientationSensor.https.html b/orientation-sensor/OrientationSensor.https.html
index 6fca92d4824aa7..5e728a688db663 100644
--- a/orientation-sensor/OrientationSensor.https.html
+++ b/orientation-sensor/OrientationSensor.https.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://w3c.github.io/sensors/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 
 <script>
diff --git a/orientation-sensor/OrientationSensor_insecure_context.html b/orientation-sensor/OrientationSensor_insecure_context.html
index 4b71e19424e1b5..18d41cec9eef52 100644
--- a/orientation-sensor/OrientationSensor_insecure_context.html
+++ b/orientation-sensor/OrientationSensor_insecure_context.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://w3c.github.io/sensors/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Note:</h2>
 <ol>
diff --git a/orientation-sensor/OrientationSensor_onerror-manual.https.html b/orientation-sensor/OrientationSensor_onerror-manual.https.html
index 6ea7582404edc5..d70ea3048eae4d 100644
--- a/orientation-sensor/OrientationSensor_onerror-manual.https.html
+++ b/orientation-sensor/OrientationSensor_onerror-manual.https.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://w3c.github.io/sensors/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
diff --git a/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html b/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html
index e1f4401b5991b5..9296af8ea6c2a6 100644
--- a/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html
+++ b/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index c1557da7ab08c5..01b45b0993597b 100644
--- a/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html b/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html
index acd9ca53bf43c2..1bf41196663e18 100644
--- a/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html
+++ b/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html b/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html
index ca71e3d708ea75..7ea2fb50f3b53f 100644
--- a/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html
+++ b/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html b/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
index 8ed6bde0345841..6d677bf0d42f76 100644
--- a/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
+++ b/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
-<script src="/sensors/generic-sensor-feature-policy-test.sub.js"></script>
+<script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <script>
 "use strict";
 
diff --git a/proximity/ProximitySensor.https.html b/proximity/ProximitySensor.https.html
index e94211123c2a24..ee7f684e02ada8 100644
--- a/proximity/ProximitySensor.https.html
+++ b/proximity/ProximitySensor.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://w3c.github.io/proximity/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <script>
 
diff --git a/proximity/ProximitySensor_insecure_context.html b/proximity/ProximitySensor_insecure_context.html
index b693ceca216f4a..b524cdc3214df1 100644
--- a/proximity/ProximitySensor_insecure_context.html
+++ b/proximity/ProximitySensor_insecure_context.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://w3c.github.io/proximity/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>
diff --git a/proximity/ProximitySensor_onerror-manual.https.html b/proximity/ProximitySensor_onerror-manual.https.html
index 8d2f8d6f0d1308..e1ee3804e37c31 100644
--- a/proximity/ProximitySensor_onerror-manual.https.html
+++ b/proximity/ProximitySensor_onerror-manual.https.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://w3c.github.io/proximity/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/sensors/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
 <div id="log"></div>
 <h2>Precondition</h2>
 <ol>