--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -283664,17 +283664,17 @@
      {}
     ]
    ],
    "webdriver/tests/element_click/__init__.py": [
     [
      {}
     ]
    ],
-   "webdriver/tests/retrieval/__init__.py": [
+   "webdriver/tests/element_retrieval/__init__.py": [
     [
      {}
     ]
    ],
    "webdriver/tests/sessions/new_session/conftest.py": [
     [
      {}
     ]
@@ -373739,16 +373739,40 @@
     ]
    ],
    "webdriver/tests/element_click/stale.py": [
     [
      "/webdriver/tests/element_click/stale.py",
      {}
     ]
    ],
+   "webdriver/tests/element_retrieval/find_element.py": [
+    [
+     "/webdriver/tests/element_retrieval/find_element.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/element_retrieval/find_element_from_element.py": [
+    [
+     "/webdriver/tests/element_retrieval/find_element_from_element.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/element_retrieval/find_element_from_elements.py": [
+    [
+     "/webdriver/tests/element_retrieval/find_element_from_elements.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/element_retrieval/find_elements.py": [
+    [
+     "/webdriver/tests/element_retrieval/find_elements.py",
+     {}
+    ]
+   ],
    "webdriver/tests/element_retrieval/get_active_element.py": [
     [
      "/webdriver/tests/element_retrieval/get_active_element.py",
      {}
     ]
    ],
    "webdriver/tests/execute_async_script/user_prompts.py": [
     [
@@ -373801,40 +373825,16 @@
     ]
    ],
    "webdriver/tests/navigation/get_title.py": [
     [
      "/webdriver/tests/navigation/get_title.py",
      {}
     ]
    ],
-   "webdriver/tests/retrieval/find_element.py": [
-    [
-     "/webdriver/tests/retrieval/find_element.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/retrieval/find_element_from_element.py": [
-    [
-     "/webdriver/tests/retrieval/find_element_from_element.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/retrieval/find_element_from_elements.py": [
-    [
-     "/webdriver/tests/retrieval/find_element_from_elements.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/retrieval/find_elements.py": [
-    [
-     "/webdriver/tests/retrieval/find_elements.py",
-     {}
-    ]
-   ],
    "webdriver/tests/sessions/get_timeouts.py": [
     [
      "/webdriver/tests/sessions/get_timeouts.py",
      {}
     ]
    ],
    "webdriver/tests/sessions/new_session/create_alwaysMatch.py": [
     [
@@ -576524,16 +576524,36 @@
   "webdriver/tests/element_click/select.py": [
    "5ba51b660c7203bba3ada597c2f56fe094358e1f",
    "wdspec"
   ],
   "webdriver/tests/element_click/stale.py": [
    "37af63203540dfe11d36fe05d74694f05c6505f2",
    "wdspec"
   ],
+  "webdriver/tests/element_retrieval/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/element_retrieval/find_element.py": [
+   "2a4cdf4c703493f7c90fc3473daa27660ac61e11",
+   "wdspec"
+  ],
+  "webdriver/tests/element_retrieval/find_element_from_element.py": [
+   "f036ef93adff21a7c83eeb8b131c96b6553b9fcb",
+   "wdspec"
+  ],
+  "webdriver/tests/element_retrieval/find_element_from_elements.py": [
+   "131c25ffbde611f98e29b778d7c861ae9619b2f6",
+   "wdspec"
+  ],
+  "webdriver/tests/element_retrieval/find_elements.py": [
+   "2d5c3c98b00e21a36f91e5797bb97835a8b63f2e",
+   "wdspec"
+  ],
   "webdriver/tests/element_retrieval/get_active_element.py": [
    "918c6e48047f31a088ec44e9b0d070b0ae3d6077",
    "wdspec"
   ],
   "webdriver/tests/execute_async_script/user_prompts.py": [
    "e31edd4537f9b7479a348465154381f5b18f938c",
    "wdspec"
   ],
@@ -576568,36 +576588,16 @@
   "webdriver/tests/navigation/current_url.py": [
    "cec2987258d9c807a247da9e0216b3af1f171484",
    "wdspec"
   ],
   "webdriver/tests/navigation/get_title.py": [
    "2ee18932a8ae3c4190b37e2b28141a6af49cc507",
    "wdspec"
   ],
-  "webdriver/tests/retrieval/__init__.py": [
-   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-   "support"
-  ],
-  "webdriver/tests/retrieval/find_element.py": [
-   "2a4cdf4c703493f7c90fc3473daa27660ac61e11",
-   "wdspec"
-  ],
-  "webdriver/tests/retrieval/find_element_from_element.py": [
-   "f036ef93adff21a7c83eeb8b131c96b6553b9fcb",
-   "wdspec"
-  ],
-  "webdriver/tests/retrieval/find_element_from_elements.py": [
-   "131c25ffbde611f98e29b778d7c861ae9619b2f6",
-   "wdspec"
-  ],
-  "webdriver/tests/retrieval/find_elements.py": [
-   "2d5c3c98b00e21a36f91e5797bb97835a8b63f2e",
-   "wdspec"
-  ],
   "webdriver/tests/sessions/get_timeouts.py": [
    "eaee354d16aa8c3a0fc960198fa4c5d9365bdee5",
    "wdspec"
   ],
   "webdriver/tests/sessions/new_session/conftest.py": [
    "d2df38e506cb9a3e501f03fe03e2a31af42d6f04",
    "support"
   ],

new file mode 100644

rename from testing/web-platform/tests/webdriver/tests/retrieval/find_element.py
rename to testing/web-platform/tests/webdriver/tests/element_retrieval/find_element.py

rename from testing/web-platform/tests/webdriver/tests/retrieval/find_element_from_element.py
rename to testing/web-platform/tests/webdriver/tests/element_retrieval/find_element_from_element.py

rename from testing/web-platform/tests/webdriver/tests/retrieval/find_element_from_elements.py
rename to testing/web-platform/tests/webdriver/tests/element_retrieval/find_element_from_elements.py

rename from testing/web-platform/tests/webdriver/tests/retrieval/find_elements.py
rename to testing/web-platform/tests/webdriver/tests/element_retrieval/find_elements.py

deleted file mode 100644