--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -67123,16 +67123,21 @@
      {}
     ]
    ],
    "webdriver/actions/__init__.py": [
     [
      {}
     ]
    ],
+   "webdriver/actions/conftest.py": [
+    [
+     {}
+    ]
+   ],
    "webdriver/actions/support/__init__.py": [
     [
      {}
     ]
    ],
    "webdriver/actions/support/keys.py": [
     [
      {}
@@ -67143,16 +67148,21 @@
      {}
     ]
    ],
    "webdriver/actions/support/test_actions_wdspec.html": [
     [
      {}
     ]
    ],
+   "webdriver/conftest.py": [
+    [
+     {}
+    ]
+   ],
    "webdriver/support/__init__.py": [
     [
      {}
     ]
    ],
    "webdriver/support/asserts.py": [
     [
      {}
@@ -138490,22 +138500,16 @@
    "workers/shared-worker-name-via-options.html": [
     [
      "/workers/shared-worker-name-via-options.html",
      {}
     ]
    ]
   },
   "wdspec": {
-   "webdriver/actions/conftest.py": [
-    [
-     "/webdriver/actions/conftest.py",
-     {}
-    ]
-   ],
    "webdriver/actions/key.py": [
     [
      "/webdriver/actions/key.py",
      {}
     ]
    ],
    "webdriver/actions/mouse.py": [
     [
@@ -138522,22 +138526,16 @@
    "webdriver/actions/special_keys.py": [
     [
      "/webdriver/actions/special_keys.py",
      {
       "timeout": "long"
      }
     ]
    ],
-   "webdriver/conftest.py": [
-    [
-     "/webdriver/conftest.py",
-     {}
-    ]
-   ],
    "webdriver/contexts.py": [
     [
      "/webdriver/contexts.py",
      {}
     ]
    ],
    "webdriver/navigation.py": [
     [
@@ -174480,17 +174478,17 @@
    "9a7ed5f97f7eff3f6711325dea7dcca1323d3bde",
    "support"
   ],
   "encrypted-media/scripts/playback-temporary.js": [
    "ac2f3395cd63f1fe4c243265c59fc3f503f09926",
    "support"
   ],
   "encrypted-media/scripts/requestmediakeysystemaccess.js": [
-   "1a17a323605ff3882b8e9d8ac4b48f1a2d592d97",
+   "6a40a2db2ae0657bda978bcaee1a12f7670634bb",
    "support"
   ],
   "encrypted-media/scripts/reset-src-after-setmediakeys.js": [
    "5c82378ce1dd5c9991b78668d7cfd0e02c2d1b5e",
    "support"
   ],
   "encrypted-media/scripts/setmediakeys-again-after-playback.js": [
    "fc6557f201aad3dfcd5df83a96d40fdbf752d009",
@@ -191764,17 +191762,17 @@
    "febb81c38f530c81d9e9837df2c6d603225ecfd1",
    "testharness"
   ],
   "html/webappapis/idle-callbacks/callback-timeout.html": [
    "ba76964575cdf9b433f26c8a5d7a8183ab5c16e9",
    "testharness"
   ],
   "html/webappapis/idle-callbacks/callback-xhr-sync.html": [
-   "79b4a278f0e35646cfdffeebf8f0523e2772bc9b",
+   "272a688feaefc3c1ebab315ae9f4633f11a966f1",
    "testharness"
   ],
   "html/webappapis/idle-callbacks/cancel-invoked.html": [
    "30787d765fa435c1392bd852559042bf3c2e2553",
    "testharness"
   ],
   "html/webappapis/idle-callbacks/idlharness.html": [
    "520ee58982b43875f3caa08d7f46b9c6311be0b6",
@@ -193408,17 +193406,17 @@
    "ce791120236e6304b41ba3c085a8f9164f6da4ca",
    "testharness"
   ],
   "media-source/mediasource-addsourcebuffer.html": [
    "c65d474f5279b3238dccf50415b5995b9d6b80ca",
    "testharness"
   ],
   "media-source/mediasource-append-buffer.html": [
-   "56f0d90f006e300a412ec7ceb3c15a252ff303a5",
+   "fed1254d64c59b625af9745bbffcf5788ac5906e",
    "testharness"
   ],
   "media-source/mediasource-appendbuffer-quota-exceeded.html": [
    "1d98e36fdc1d93444b5a9809774ed0ce58b8680b",
    "testharness"
   ],
   "media-source/mediasource-appendwindow.html": [
    "5a39b4e58a18a4d878e6b710e4506262c2335519",
@@ -193568,17 +193566,17 @@
    "2936b8d06311bb9b796bf8e6c997c25a2e2d3709",
    "testharness"
   ],
   "media-source/mediasource-seek-during-pending-seek.html": [
    "44ff5284c77dab088494924fb8d11a3e7da48a5a",
    "testharness"
   ],
   "media-source/mediasource-seekable.html": [
-   "5f75983eeb4eed4095a625ec997c01eaba021166",
+   "6e92616bfb23e0d00e387688ff6754e68b1da35f",
    "testharness"
   ],
   "media-source/mediasource-sequencemode-append-buffer.html": [
    "8709f7b57b3a460909dc0456a70fc9b83b111fa4",
    "testharness"
   ],
   "media-source/mediasource-sourcebuffer-mode-timestamps.html": [
    "caa103e85e89c1bccda5e9d2b563bb66d7a44006",
@@ -220016,17 +220014,17 @@
    "eee8ff07b3ec5e83e5f18305f5bc00eb72468443",
    "testharness"
   ],
   "web-animations/animation-model/animation-types/interpolation-per-property.html": [
    "55100f7d505bc8cbc966ced0d1337ed78534a553",
    "testharness"
   ],
   "web-animations/animation-model/animation-types/property-list.js": [
-   "a6860f4971e06078b5abdd57b3d7f57c0adff51e",
+   "a2579f817da7a123f1c4ff1ec1ec3d8675666201",
    "support"
   ],
   "web-animations/animation-model/animation-types/property-types.js": [
    "ee3e5ae1923027f7e9dd80da11e765085a02c367",
    "support"
   ],
   "web-animations/animation-model/animation-types/spacing-keyframes-filters.html": [
    "bd771a8a18245560221d92ea3495f81918c09848",
@@ -220577,17 +220575,17 @@
    "support"
   ],
   "webdriver/actions/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/actions/conftest.py": [
    "78b6434a88021b7f56e5a7bf3e858fc9558a7c19",
-   "wdspec"
+   "support"
   ],
   "webdriver/actions/key.py": [
    "918bcadf034657dfcb679fd92c8a11efe34bfedf",
    "wdspec"
   ],
   "webdriver/actions/mouse.py": [
    "9b591d61e353548d0894db281abad0c006e26497",
    "wdspec"
@@ -220613,17 +220611,17 @@
    "support"
   ],
   "webdriver/actions/support/test_actions_wdspec.html": [
    "c56cc117512bf9a5b6378dcead8e2640493d23a4",
    "support"
   ],
   "webdriver/conftest.py": [
    "6217bd14a1ec72f00d5a6a9014a9dc991e4289db",
-   "wdspec"
+   "support"
   ],
   "webdriver/contexts.py": [
    "302a1a0cb246aef74f2c1d961a210d9de7e366c5",
    "wdspec"
   ],
   "webdriver/interface.html": [
    "d783d0dd370f58b264ef238d8da5cd8601dc3c7f",
    "testharness"

--- a/testing/web-platform/mozilla/meta/MANIFEST.json
+++ b/testing/web-platform/mozilla/meta/MANIFEST.json
@@ -873,17 +873,17 @@
    "65143dd5377acc88b180460a46dd4bbb79cbf68e",
    "testharness"
   ],
   "focus/Selection_addRange_into_iframe_iframe.html": [
    "8e8eb8ee04e7a0879828de2c5fb2501c088504a4",
    "support"
   ],
   "focus/Selection_collapse.html": [
-   "15f83b9e158ff63fd3428c4d681ce4777b74198c",
+   "7367e997760a15f19b46545f371659c3093e28ae",
    "testharness"
   ],
   "focus/Selection_collapseToEnd.html": [
    "92b38fcaffdee31422690f35c3d9147452b3a2e2",
    "testharness"
   ],
   "focus/Selection_collapseToStart.html": [
    "e47f9a13430db7d9f2c18ee41f9445ea372f0a18",

--- a/testing/web-platform/tests/tools/manifest/sourcefile.py
+++ b/testing/web-platform/tests/tools/manifest/sourcefile.py
@@ -222,17 +222,17 @@ class SourceFile(object):
     def name_is_webdriver(self):
         """Check if the file name matches the conditions for the file to
         be a webdriver spec test file"""
         # wdspec tests are in subdirectories of /webdriver excluding __init__.py
         # files.
         rel_dir_tree = self.rel_path.split(os.path.sep)
         return (rel_dir_tree[0] == "webdriver" and
                 len(rel_dir_tree) > 1 and
-                self.filename != "__init__.py" and
+                self.filename not in ("__init__.py", "conftest.py") and
                 fnmatch(self.filename, wd_pattern))
 
     @property
     def name_is_reference(self):
         """Check if the file name matches the conditions for the file to
         be a reference file (not a reftest)"""
         return "/reference/" in self.url or "/reftest/" in self.url or bool(reference_file_re.search(self.name))