diff --git a/testing/web-platform/tests/orientation-event/free-fall-manual.https.html b/testing/web-platform/tests/orientation-event/motion/free-fall-manual.https.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/free-fall-manual.https.html
rename to testing/web-platform/tests/orientation-event/motion/free-fall-manual.https.html
diff --git a/testing/web-platform/tests/orientation-event/screen-upmost-manual.https.html b/testing/web-platform/tests/orientation-event/motion/screen-upmost-manual.https.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/screen-upmost-manual.https.html
rename to testing/web-platform/tests/orientation-event/motion/screen-upmost-manual.https.html
diff --git a/testing/web-platform/tests/orientation-event/screen-upright-manual.https.html b/testing/web-platform/tests/orientation-event/motion/screen-upright-manual.https.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/screen-upright-manual.https.html
rename to testing/web-platform/tests/orientation-event/motion/screen-upright-manual.https.html
diff --git a/testing/web-platform/tests/orientation-event/t025-manual.https.html b/testing/web-platform/tests/orientation-event/motion/t025-manual.https.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/t025-manual.https.html
rename to testing/web-platform/tests/orientation-event/motion/t025-manual.https.html
diff --git a/testing/web-platform/tests/orientation-event/t028-manual.https.html b/testing/web-platform/tests/orientation-event/motion/t028-manual.https.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/t028-manual.https.html
rename to testing/web-platform/tests/orientation-event/motion/t028-manual.https.html
diff --git a/testing/web-platform/tests/orientation-event/deviceorientationabsoluteevent.https.html b/testing/web-platform/tests/orientation-event/orientation/deviceorientationabsoluteevent.https.html
similarity index 92%
rename from testing/web-platform/tests/orientation-event/deviceorientationabsoluteevent.https.html
rename to testing/web-platform/tests/orientation-event/orientation/deviceorientationabsoluteevent.https.html
index 8371098a194e..e63783f6cf47 100644
--- a/testing/web-platform/tests/orientation-event/deviceorientationabsoluteevent.https.html
+++ b/testing/web-platform/tests/orientation-event/orientation/deviceorientationabsoluteevent.https.html
@@ -16,7 +16,7 @@
         if (!run) {
           run = true;
           t.step(function () {
-            assert_true(e instanceof DeviceOrientationEvent, "instanceof DeviceOrientationEvent");
+            assert_true(e instanceof DeviceOrientationEvent);
             assert_equals(e.type, "deviceorientationabsolute", "type is set to \"deviceorientationabsolute\"");
             assert_equals(e.alpha, null, "alpha is set to null");
             assert_equals(e.beta, null, "beta is set to null");
diff --git a/testing/web-platform/tests/orientation-event/horizontal-surface-manual.https.html b/testing/web-platform/tests/orientation-event/orientation/horizontal-surface-manual.https.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/horizontal-surface-manual.https.html
rename to testing/web-platform/tests/orientation-event/orientation/horizontal-surface-manual.https.html
diff --git a/testing/web-platform/tests/orientation-event/t006-manual.https.html b/testing/web-platform/tests/orientation-event/orientation/t006-manual.https.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/t006-manual.https.html
rename to testing/web-platform/tests/orientation-event/orientation/t006-manual.https.html
diff --git a/testing/web-platform/tests/orientation-event/t009-manual.https.html b/testing/web-platform/tests/orientation-event/orientation/t009-manual.https.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/t009-manual.https.html
rename to testing/web-platform/tests/orientation-event/orientation/t009-manual.https.html
diff --git a/testing/web-platform/tests/orientation-event/t010-manual.https.html b/testing/web-platform/tests/orientation-event/orientation/t010-manual.https.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/t010-manual.https.html
rename to testing/web-platform/tests/orientation-event/orientation/t010-manual.https.html
diff --git a/testing/web-platform/tests/orientation-event/t012-manual.https.html b/testing/web-platform/tests/orientation-event/orientation/t012-manual.https.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/t012-manual.https.html
rename to testing/web-platform/tests/orientation-event/orientation/t012-manual.https.html