diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 4013bf681cbc..ef7eac7d106c 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -1675,42 +1675,6 @@
      {}
     ]
    ],
-   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete-manual.html": [
-    [
-     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete-manual.html",
-     {}
-    ]
-   ],
-   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list-manual.html": [
-    [
-     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list-manual.html",
-     {}
-    ]
-   ],
-   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate-manual.html": [
-    [
-     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate-manual.html",
-     {}
-    ]
-   ],
-   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber-manual.html": [
-    [
-     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber-manual.html",
-     {}
-    ]
-   ],
-   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length-manual.html": [
-    [
-     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length-manual.html",
-     {}
-    ]
-   ],
-   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex-manual.html": [
-    [
-     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex-manual.html",
-     {}
-    ]
-   ],
    "old-tests/submission/Microsoft/dragdrop/dragdrop_000-manual.htm": [
     [
      "/old-tests/submission/Microsoft/dragdrop/dragdrop_000-manual.htm",
@@ -108170,6 +108134,42 @@
      {}
     ]
    ],
+   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete.html": [
+    [
+     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete.html",
+     {}
+    ]
+   ],
+   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list.html": [
+    [
+     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list.html",
+     {}
+    ]
+   ],
+   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate.html": [
+    [
+     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate.html",
+     {}
+    ]
+   ],
+   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber.html": [
+    [
+     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber.html",
+     {}
+    ]
+   ],
+   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length.html": [
+    [
+     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length.html",
+     {}
+    ]
+   ],
+   "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex.html": [
+    [
+     "/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex.html",
+     {}
+    ]
+   ],
    "old-tests/submission/Infraware/Forms/contents/Forms/button_checkvalidity.html": [
     [
      "/old-tests/submission/Infraware/Forms/contents/Forms/button_checkvalidity.html",
@@ -188839,29 +188839,29 @@
    "054fe1ca53999433cf4cddff7193d9f05d6c48dd",
    "testharness"
   ],
-  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete-manual.html": [
+  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete.html": [
    "982fae5b648a4ffec9dcf189b388cdea548d171a",
-   "manual"
+   "testharness"
   ],
-  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list-manual.html": [
+  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list.html": [
    "a45044c38b98f57b697e8b521edaabe26b897153",
-   "manual"
+   "testharness"
   ],
-  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate-manual.html": [
+  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate.html": [
    "4ce3a7f6b5a1b3a99ff810a10cb805c3a8d74839",
-   "manual"
+   "testharness"
   ],
-  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber-manual.html": [
+  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber.html": [
    "8aecbcc14e2295f860f94444ed155e41b2ba73b5",
-   "manual"
+   "testharness"
   ],
-  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length-manual.html": [
+  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length.html": [
    "7e57d2b51b52665b2449a1963594ce0e8ac7af5e",
-   "manual"
+   "testharness"
   ],
-  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex-manual.html": [
+  "old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex.html": [
    "a41a903089c804cbc5b3892af00d283f02d318f5",
-   "manual"
+   "testharness"
   ],
   "old-tests/submission/Infraware/Forms/contents/Forms/button_checkvalidity.html": [
    "e6c56660e7c34d00e8d213dbc224d0ab1b855a59",
diff --git a/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete.html.ini b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete.html.ini
new file mode 100644
index 000000000000..26cc72633378
--- /dev/null
+++ b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete.html.ini
@@ -0,0 +1,3 @@
+[input_autocomplete.html]
+  type: testharness
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list.html.ini b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list.html.ini
new file mode 100644
index 000000000000..8cebb84916f7
--- /dev/null
+++ b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list.html.ini
@@ -0,0 +1,3 @@
+[input_list.html]
+  type: testharness
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate.html.ini b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate.html.ini
new file mode 100644
index 000000000000..3484d829809a
--- /dev/null
+++ b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate.html.ini
@@ -0,0 +1,3 @@
+[input_valueasdate.html]
+  type: testharness
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber.html.ini b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber.html.ini
new file mode 100644
index 000000000000..fddb6ffbf658
--- /dev/null
+++ b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber.html.ini
@@ -0,0 +1,3 @@
+[input_valueasnumber.html]
+  type: testharness
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length.html.ini b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length.html.ini
new file mode 100644
index 000000000000..c3d9fcab0855
--- /dev/null
+++ b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length.html.ini
@@ -0,0 +1,3 @@
+[select_length.html]
+  type: testharness
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex.html.ini b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex.html.ini
new file mode 100644
index 000000000000..a1b6e9106bc6
--- /dev/null
+++ b/testing/web-platform/meta/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex.html.ini
@@ -0,0 +1,3 @@
+[select_selectedindex.html]
+  type: testharness
+  expected: TIMEOUT
diff --git a/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete-manual.html b/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete.html
similarity index 100%
rename from testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete-manual.html
rename to testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_autocomplete.html
diff --git a/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list-manual.html b/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list.html
similarity index 100%
rename from testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list-manual.html
rename to testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_list.html
diff --git a/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate-manual.html b/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate.html
similarity index 100%
rename from testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate-manual.html
rename to testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasdate.html
diff --git a/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber-manual.html b/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber.html
similarity index 100%
rename from testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber-manual.html
rename to testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/input_valueasnumber.html
diff --git a/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length-manual.html b/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length.html
similarity index 100%
rename from testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length-manual.html
rename to testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_length.html
diff --git a/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex-manual.html b/testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex.html
similarity index 100%
rename from testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex-manual.html
rename to testing/web-platform/tests/old-tests/submission/Infraware/Forms/contents/Forms/Not_Use/select_selectedindex.html