new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/pointerevents/compat/pointerevent_touch-action-verification.html.ini
@@ -0,0 +1,10 @@
+[pointerevent_touch-action-verification.html]
+  [explicit-pinch-zoom-pan-x-pan-up]
+    expected: FAIL
+
+  [explicit-pinch-zoom]
+    expected: FAIL
+
+  [explicit-pinch-zoom-pan-x-pan-y]
+    expected: FAIL
+

deleted file mode 100644
--- a/testing/web-platform/meta/pointerevents/extension/idlharness.window.js.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[idlharness.window.html]
-  [PointerEvent interface: operation getPredictedEvents()]
-    expected: FAIL
-
-  [PointerEvent interface: new PointerEvent("pointer") must inherit property "getPredictedEvents()" with the proper type]
-    expected: FAIL
-
-  [PointerEvent interface: operation getCoalescedEvents()]
-    expected:
-      if (os == "android") and not e10s: FAIL
-
-  [PointerEvent interface: new PointerEvent("pointer") must inherit property "getCoalescedEvents()" with the proper type]
-    expected:
-      if (os == "android") and not e10s: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/pointerevents/extension/pointerevent_constructor.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[pointerevent_constructor.html]
-  prefs: [dom.w3c_pointer_events.enabled:true]
-  [PointerEvent: Constructor test]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/pointerevents/extension/pointerevent_getCoalescedEvents_when_pointerlocked.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[pointerevent_getCoalescedEvents_when_pointerlocked.html]
-  [mouse pointermove getCoalescedEvents when lock test]
-    disabled: Bug 1556694
-    expected:
-      if os == "android": FAIL
-      if (os == "win") and (version == "10.0.17134") and debug and webrender: FAIL
-      if (os == "win") and (version == "10.0.17134") and debug: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/pointerevents/extension/pointerevent_pointerrawupdate.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[pointerevent_pointerrawupdate.html]
-  expected:
-    if (os == "android") and not e10s: TIMEOUT
-  [pointerrawupdate event received]
-    expected:
-      FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/pointerevents/extension/pointerevent_touch-action-verification.html.ini
+++ /dev/null
@@ -1,46 +0,0 @@
-[pointerevent_touch-action-verification.html]
-  [explicit-pan-left]
-    expected: FAIL
-
-  [explicit-pan-right]
-    expected: FAIL
-
-  [explicit-pan-up]
-    expected: FAIL
-
-  [explicit-pan-down]
-    expected: FAIL
-
-  [explicit-pinch-zoom]
-    expected: FAIL
-
-  [explicit-pan-left-pan-up]
-    expected: FAIL
-
-  [explicit-pan-left-pan-down]
-    expected: FAIL
-
-  [explicit-pan-right-pan-up]
-    expected: FAIL
-
-  [explicit-pan-right-pan-down]
-    expected: FAIL
-
-  [explicit-pan-up-pan-left]
-    expected: FAIL
-
-  [explicit-pan-up-pan-right]
-    expected: FAIL
-
-  [explicit-pan-down-pan-left]
-    expected: FAIL
-
-  [explicit-pan-down-pan-right]
-    expected: FAIL
-
-  [explicit-pinch-zoom-pan-x-pan-up]
-    expected: FAIL
-
-  [explicit-pinch-zoom-pan-x-pan-y]
-    expected: FAIL
-

rename from testing/web-platform/meta/pointerevents/extension/pointerevent_coalesced_events_attributes.html.ini
rename to testing/web-platform/meta/pointerevents/pointerevent_coalesced_events_attributes.html.ini

--- a/testing/web-platform/meta/pointerevents/pointerevent_constructor.html.ini
+++ b/testing/web-platform/meta/pointerevents/pointerevent_constructor.html.ini
@@ -1,2 +1,5 @@
 [pointerevent_constructor.html]
   prefs: [dom.w3c_pointer_events.enabled:true]
+  [PointerEvent: Constructor test]
+    expected: FAIL
+

new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/pointerevents/pointerevent_pointerrawupdate.html.ini
@@ -0,0 +1,4 @@
+[pointerevent_pointerrawupdate.html]
+  [pointerrawupdate event received]
+    expected: FAIL
+

rename from testing/web-platform/meta/pointerevents/extension/pointerevent_touch-action-pan-down-css_touch.html.ini
rename to testing/web-platform/meta/pointerevents/pointerevent_touch-action-pan-down-css_touch.html.ini

rename from testing/web-platform/meta/pointerevents/extension/pointerevent_touch-action-pan-left-css_touch.html.ini
rename to testing/web-platform/meta/pointerevents/pointerevent_touch-action-pan-left-css_touch.html.ini

rename from testing/web-platform/meta/pointerevents/extension/pointerevent_touch-action-pan-right-css_touch.html.ini
rename to testing/web-platform/meta/pointerevents/pointerevent_touch-action-pan-right-css_touch.html.ini

rename from testing/web-platform/meta/pointerevents/extension/pointerevent_touch-action-pan-up-css_touch.html.ini
rename to testing/web-platform/meta/pointerevents/pointerevent_touch-action-pan-up-css_touch.html.ini

--- a/testing/web-platform/meta/pointerevents/pointerevent_touch-action-verification.html.ini
+++ b/testing/web-platform/meta/pointerevents/pointerevent_touch-action-verification.html.ini
@@ -1,2 +1,38 @@
 [pointerevent_touch-action-verification.html]
   prefs: [layout.css.touch_action.enabled:true]
+  [explicit-pan-down-pan-left]
+    expected: FAIL
+
+  [explicit-pan-up]
+    expected: FAIL
+
+  [explicit-pan-up-pan-left]
+    expected: FAIL
+
+  [explicit-pan-right-pan-down]
+    expected: FAIL
+
+  [explicit-pan-left-pan-down]
+    expected: FAIL
+
+  [explicit-pan-left]
+    expected: FAIL
+
+  [explicit-pan-right-pan-up]
+    expected: FAIL
+
+  [explicit-pan-right]
+    expected: FAIL
+
+  [explicit-pan-down]
+    expected: FAIL
+
+  [explicit-pan-up-pan-right]
+    expected: FAIL
+
+  [explicit-pan-down-pan-right]
+    expected: FAIL
+
+  [explicit-pan-left-pan-up]
+    expected: FAIL
+

new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/pointerevents/pointerlock/__dir__.ini
@@ -0,0 +1,1 @@
+lsan-allowed: [NS_NewDOMPointerEvent, mozilla::WidgetPointerEvent::Duplicate]

new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html.ini
@@ -0,0 +1,13 @@
+[pointerevent_getCoalescedEvents_when_pointerlocked.html]
+  [mouse pointermove getCoalescedEvents when lock test]
+    expected:
+      if (os == "win") and not fission and (processor == "x86_64") and debug and not webrender: ["FAIL", "PASS"]
+      if (os == "win") and not fission and (processor == "x86_64") and not debug and webrender: ["FAIL", "PASS"]
+      if (os == "win") and not fission and (processor == "x86_64") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and debug and not webrender and not fission: ["PASS", "FAIL"]
+      if (os == "linux") and debug and not webrender and fission: ["PASS", "FAIL"]
+      if (os == "linux") and debug and webrender and fission: ["PASS", "FAIL"]
+      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not fission and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not fission and not webrender: ["PASS", "FAIL"]
+