--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -397167,17 +397167,19 @@
     [
      "/webdriver/tests/delete_cookie/delete.py",
      {}
     ]
    ],
    "webdriver/tests/delete_cookie/user_prompts.py": [
     [
      "/webdriver/tests/delete_cookie/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/dismiss_alert/dismiss.py": [
     [
      "/webdriver/tests/dismiss_alert/dismiss.py",
      {}
     ]
    ],
@@ -397235,17 +397237,19 @@
     [
      "/webdriver/tests/execute_async_script/collections.py",
      {}
     ]
    ],
    "webdriver/tests/execute_async_script/user_prompts.py": [
     [
      "/webdriver/tests/execute_async_script/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/execute_script/collections.py": [
     [
      "/webdriver/tests/execute_script/collections.py",
      {}
     ]
    ],
@@ -397261,17 +397265,19 @@
      {
       "timeout": "long"
      }
     ]
    ],
    "webdriver/tests/execute_script/user_prompts.py": [
     [
      "/webdriver/tests/execute_script/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/find_element/find.py": [
     [
      "/webdriver/tests/find_element/find.py",
      {}
     ]
    ],
@@ -397297,17 +397303,19 @@
     [
      "/webdriver/tests/fullscreen_window/fullscreen.py",
      {}
     ]
    ],
    "webdriver/tests/fullscreen_window/user_prompts.py": [
     [
      "/webdriver/tests/fullscreen_window/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/get_active_element/get.py": [
     [
      "/webdriver/tests/get_active_element/get.py",
      {}
     ]
    ],
@@ -397321,17 +397329,19 @@
     [
      "/webdriver/tests/get_current_url/get.py",
      {}
     ]
    ],
    "webdriver/tests/get_current_url/user_prompts.py": [
     [
      "/webdriver/tests/get_current_url/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/get_element_attribute/get.py": [
     [
      "/webdriver/tests/get_element_attribute/get.py",
      {}
     ]
    ],
@@ -397339,29 +397349,33 @@
     [
      "/webdriver/tests/get_element_property/get.py",
      {}
     ]
    ],
    "webdriver/tests/get_element_property/user_prompts.py": [
     [
      "/webdriver/tests/get_element_property/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/get_element_tag_name/get.py": [
     [
      "/webdriver/tests/get_element_tag_name/get.py",
      {}
     ]
    ],
    "webdriver/tests/get_element_tag_name/user_prompts.py": [
     [
      "/webdriver/tests/get_element_tag_name/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/get_element_text/get.py": [
     [
      "/webdriver/tests/get_element_text/get.py",
      {}
     ]
    ],
@@ -397381,65 +397395,75 @@
     [
      "/webdriver/tests/get_title/get.py",
      {}
     ]
    ],
    "webdriver/tests/get_title/user_prompts.py": [
     [
      "/webdriver/tests/get_title/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/get_window_rect/get.py": [
     [
      "/webdriver/tests/get_window_rect/get.py",
      {}
     ]
    ],
    "webdriver/tests/get_window_rect/user_prompts.py": [
     [
      "/webdriver/tests/get_window_rect/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/is_element_selected/selected.py": [
     [
      "/webdriver/tests/is_element_selected/selected.py",
      {}
     ]
    ],
    "webdriver/tests/is_element_selected/user_prompts.py": [
     [
      "/webdriver/tests/is_element_selected/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/maximize_window/maximize.py": [
     [
      "/webdriver/tests/maximize_window/maximize.py",
      {}
     ]
    ],
    "webdriver/tests/maximize_window/user_prompts.py": [
     [
      "/webdriver/tests/maximize_window/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/minimize_window/minimize.py": [
     [
      "/webdriver/tests/minimize_window/minimize.py",
      {}
     ]
    ],
    "webdriver/tests/minimize_window/user_prompts.py": [
     [
      "/webdriver/tests/minimize_window/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/new_session/create_alwaysMatch.py": [
     [
      "/webdriver/tests/new_session/create_alwaysMatch.py",
      {
       "timeout": "long"
      }
@@ -397509,17 +397533,19 @@
      {
       "timeout": "long"
      }
     ]
    ],
    "webdriver/tests/set_window_rect/user_prompts.py": [
     [
      "/webdriver/tests/set_window_rect/user_prompts.py",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/status/status.py": [
     [
      "/webdriver/tests/status/status.py",
      {}
     ]
    ],
@@ -611520,17 +611546,17 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/delete_cookie/delete.py": [
    "1f0d6b861be1ed682fd87a402908cee186a3987c",
    "wdspec"
   ],
   "webdriver/tests/delete_cookie/user_prompts.py": [
-   "65b753bd80a06c3c20b0330f624a4d395fdb7ab2",
+   "e1691d4ef3eeae1527eee9b180e50bb0d6a208dc",
    "wdspec"
   ],
   "webdriver/tests/dismiss_alert/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/dismiss_alert/dismiss.py": [
    "e213f1939ff5cc2fbdebb2bd8e9445e284803a60",
@@ -611544,77 +611570,77 @@
    "d5a0a37d410f5a748aee5ac5be75acb837e491f8",
    "wdspec"
   ],
   "webdriver/tests/element_click/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/element_click/bubbling.py": [
-   "46fb2d0359f5f90eec4cc1f06d2591b5fd2fdf78",
+   "492e283b686abe0743d72e31017be149726628f9",
    "wdspec"
   ],
   "webdriver/tests/element_click/select.py": [
    "bddc341a0feb0d06e75415b8f98b8e9e0c2a829d",
    "wdspec"
   ],
   "webdriver/tests/element_click/stale.py": [
-   "b9f503108f99d4a87784590b69bb2ad6a23c4ac8",
+   "490b6c17365c5eab24fd4a7ac07be6614a86a934",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/element_send_keys/content_editable.py": [
    "9c071e60e1203cf31120f20874b5f38ba41dacc3",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/form_controls.py": [
    "ec6bdf64c7c4d2e3963e89c8410f69f738565f78",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/interactability.py": [
-   "485bd25ba5e1d8c8a646675d0738f278291c7c70",
+   "5374827c90845ded660d540d23bb7e07ac84e445",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/scroll_into_view.py": [
-   "b58404e8bb2c8b0cc75300ed1880cfeeb052a364",
+   "e4a50a53a13c1ab76c6c002bbda1c103f8c32ccf",
    "wdspec"
   ],
   "webdriver/tests/execute_async_script/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/execute_async_script/collections.py": [
    "d6c95dfdcbfc3b9cf91cf6f943a17b7cd0fee79d",
    "wdspec"
   ],
   "webdriver/tests/execute_async_script/user_prompts.py": [
-   "8b161d459074d7e2a3e726663cedfb1cd8636f0b",
+   "d89434bc628d4800f2a5a8554e7cdcbba3b6c1e7",
    "wdspec"
   ],
   "webdriver/tests/execute_script/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/execute_script/collections.py": [
    "0ee4e340b38b6aa59043286755822460e76b2dbd",
    "wdspec"
   ],
   "webdriver/tests/execute_script/cyclic.py": [
    "21bae43b3a6e966b8698b7c439b29a68029adc58",
    "wdspec"
   ],
   "webdriver/tests/execute_script/json_serialize_windowproxy.py": [
-   "00e735d58b77e9fac207c5ea29e0e70ff43ffd14",
+   "20db10d82ed2b28a22674fcdc37cac0323d33c95",
    "wdspec"
   ],
   "webdriver/tests/execute_script/user_prompts.py": [
-   "0e94c156954b90eca2005f6ad9fa5a4601169fd9",
+   "4bd4e9089185505d8add4d5ebe9806498da42999",
    "wdspec"
   ],
   "webdriver/tests/find_element/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/find_element/find.py": [
    "9af0db4de0d09cbf68fa43bb40145cffc7b95635",
@@ -611648,17 +611674,17 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/fullscreen_window/fullscreen.py": [
    "8a6e06b2fbd2ec80326ab1145e6ddfb35c6995b4",
    "wdspec"
   ],
   "webdriver/tests/fullscreen_window/user_prompts.py": [
-   "8d6d68bb6bfa9956db5b33598ae3cf33f7022de4",
+   "33b337cd18ddc05f1f3aa486b06443b32a1ef1db",
    "wdspec"
   ],
   "webdriver/tests/get_active_element/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/get_active_element/get.py": [
    "6d48b8577c9edf5f1e39fae461831de742ff9dd8",
@@ -611676,45 +611702,45 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/get_current_url/get.py": [
    "f65054e80f7ddc9a7b8600765929935355b5f447",
    "wdspec"
   ],
   "webdriver/tests/get_current_url/user_prompts.py": [
-   "3241e1d4dbda430b32763006d558fb53d06ffaa1",
+   "74b2944c6e646794db8b7b3217f55784c1228c40",
    "wdspec"
   ],
   "webdriver/tests/get_element_attribute/get.py": [
    "3fdd451b8aa73729f25325cb0e43ae389a223ee7",
    "wdspec"
   ],
   "webdriver/tests/get_element_property/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/get_element_property/get.py": [
    "2b36e390348a37e2138f480a7f36eb08ef6a2ee5",
    "wdspec"
   ],
   "webdriver/tests/get_element_property/user_prompts.py": [
-   "84a1817bd815bd8c2267862eb3d5f927f2849777",
+   "a9e8fd2e5c1272e4075c7d1ef902666778e5808c",
    "wdspec"
   ],
   "webdriver/tests/get_element_tag_name/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/get_element_tag_name/get.py": [
    "66a0b57c29a006b1200e63239a4ea5f8cb90c1bd",
    "wdspec"
   ],
   "webdriver/tests/get_element_tag_name/user_prompts.py": [
-   "49104f85f3e5598ba04e32596e2d96224eb08a05",
+   "7b8a99406217ab8806ea8e37d8c19d27e788da33",
    "wdspec"
   ],
   "webdriver/tests/get_element_text/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/get_element_text/get.py": [
    "8edcb5068617b13c808ddc336196a7e0e98a8072",
@@ -611740,69 +611766,69 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/get_title/get.py": [
    "69a3e55d2f34dc02285af89d78a75d46e7d1282c",
    "wdspec"
   ],
   "webdriver/tests/get_title/user_prompts.py": [
-   "fd24d562bd7d945de1e5f87c241f4c3717359838",
+   "b77423d915419b59739b9d86067c58d35d67f7f7",
    "wdspec"
   ],
   "webdriver/tests/get_window_rect/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/get_window_rect/get.py": [
    "8d687026889e601f4c1987996f4e5306b0f627f9",
    "wdspec"
   ],
   "webdriver/tests/get_window_rect/user_prompts.py": [
-   "5fd2bc48547788bd24b3b5fc38a18209d85a6747",
+   "f13acee3fa3aeb45061afb1507769912c2ea5458",
    "wdspec"
   ],
   "webdriver/tests/interface.html": [
    "f7b2c45ff8b1b5790dd390fbe2ab997766f5d9a8",
    "testharness"
   ],
   "webdriver/tests/is_element_selected/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/is_element_selected/selected.py": [
    "afed5bfc86527410e0fb521f7f75d79bee1fb060",
    "wdspec"
   ],
   "webdriver/tests/is_element_selected/user_prompts.py": [
-   "69d7821499ee460f31ed97f3f839cf6899add8fd",
+   "17ff125704c7a63d36b098d01e7da7dd942cdfa6",
    "wdspec"
   ],
   "webdriver/tests/maximize_window/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/maximize_window/maximize.py": [
    "be54b714b8d6c8f282ee896af4a449ccba4cd060",
    "wdspec"
   ],
   "webdriver/tests/maximize_window/user_prompts.py": [
-   "99afcf2148c524eabee410c5ebb89327467a5e35",
+   "f5ce262d9e9543e5fc46100e8ad6253dda41c330",
    "wdspec"
   ],
   "webdriver/tests/minimize_window/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/minimize_window/minimize.py": [
    "8b59610ffcbb4ab41a74f149dc74d415edfaf60f",
    "wdspec"
   ],
   "webdriver/tests/minimize_window/user_prompts.py": [
-   "668c775a0e60b377a5a558a2a38b8887ac2683a0",
+   "af4c89f01ac1037634564bc9e178bd2f2f703a82",
    "wdspec"
   ],
   "webdriver/tests/new_session/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/new_session/conftest.py": [
    "d2df38e506cb9a3e501f03fe03e2a31af42d6f04",
@@ -611864,17 +611890,17 @@
    "479379109115668183643e8a050396219332887d",
    "wdspec"
   ],
   "webdriver/tests/set_window_rect/set.py": [
    "f6202880dbdd4a407fa2944a68765757dbcb932b",
    "wdspec"
   ],
   "webdriver/tests/set_window_rect/user_prompts.py": [
-   "4ed66d05835d3ab229cb90928e0ca2a15ba08c8a",
+   "4759b9d0eb0b079aaea6d850721056a143aa40e3",
    "wdspec"
   ],
   "webdriver/tests/status/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/status/status.py": [
    "1302349ca7d6a3dcc49e26ca0345023a5c6bbe14",

--- a/testing/web-platform/tests/webdriver/tests/close_window/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/close_window/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_dialog_handled
 from tests.support.fixtures import create_dialog, create_window
 from tests.support.inline import inline
 
 
 def close(session):
     return session.transport.send(
         "DELETE", "session/{session_id}/window".format(**vars(session)))

--- a/testing/web-platform/tests/webdriver/tests/delete_cookie/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/delete_cookie/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_dialog_handled
 from tests.support.fixtures import create_dialog
 from tests.support.inline import inline
 
 
 def delete_cookie(session, name):
     return session.transport.send("DELETE", "/session/%s/cookie/%s" % (session.session_id, name))
 

--- a/testing/web-platform/tests/webdriver/tests/execute_async_script/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/execute_async_script/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 import pytest
 
 from webdriver import error
 
 from tests.support.asserts import assert_success
 
 
 def execute_async_script(session, script, args=None):

--- a/testing/web-platform/tests/webdriver/tests/execute_script/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/execute_script/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 import pytest
 
 from webdriver import error
 
 from tests.support.asserts import assert_success
 
 
 def execute_script(session, script, args=None):

--- a/testing/web-platform/tests/webdriver/tests/fullscreen_window/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/fullscreen_window/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_dialog_handled
 from tests.support.fixtures import create_dialog
 from tests.support.inline import inline
 
 
 def read_global(session, name):
     return session.execute_script("return %s;" % name)
 

--- a/testing/web-platform/tests/webdriver/tests/get_current_url/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/get_current_url/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_dialog_handled
 from tests.support.fixtures import create_dialog
 from tests.support.inline import inline
 
 
 def read_global(session, name):
     return session.execute_script("return %s;" % name)
 

--- a/testing/web-platform/tests/webdriver/tests/get_element_property/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/get_element_property/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
 from tests.support.fixtures import create_dialog
 from tests.support.inline import inline
 
 
 def read_global(session, name):
     return session.execute_script("return %s;" % name)
 

--- a/testing/web-platform/tests/webdriver/tests/get_element_tag_name/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/get_element_tag_name/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
 from tests.support.fixtures import create_dialog
 from tests.support.inline import inline
 
 
 def read_global(session, name):
     return session.execute_script("return %s;" % name)
 

--- a/testing/web-platform/tests/webdriver/tests/get_title/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/get_title/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
 from tests.support.fixtures import create_dialog
 from tests.support.inline import inline
 
 
 def read_global(session, name):
     return session.execute_script("return %s;" % name)
 

--- a/testing/web-platform/tests/webdriver/tests/get_window_rect/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/get_window_rect/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_dialog_handled
 from tests.support.fixtures import create_dialog
 from tests.support.inline import inline
 
 
 alert_doc = inline("<script>window.alert()</script>")
 
 

--- a/testing/web-platform/tests/webdriver/tests/is_element_selected/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/is_element_selected/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
 from tests.support.inline import inline
 from tests.support.fixtures import create_dialog
 
 
 def is_element_selected(session, element_id):
     return session.transport.send(
         "GET", "session/{session_id}/element/{element_id}/selected".format(

--- a/testing/web-platform/tests/webdriver/tests/maximize_window/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/maximize_window/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_dialog_handled
 from tests.support.fixtures import create_dialog
 from tests.support.inline import inline
 
 
 def maximize(session):
     return session.transport.send(
         "POST", "session/{session_id}/window/maximize".format(**vars(session)))

--- a/testing/web-platform/tests/webdriver/tests/minimize_window/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/minimize_window/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_dialog_handled
 from tests.support.fixtures import create_dialog
 from tests.support.inline import inline
 
 
 def minimize(session):
     return session.transport.send(
         "POST", "session/{session_id}/window/minimize".format(**vars(session)))

--- a/testing/web-platform/tests/webdriver/tests/set_window_rect/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/set_window_rect/user_prompts.py
@@ -1,8 +1,10 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
 from tests.support.fixtures import create_dialog
 
 
 def set_window_rect(session, rect):
     return session.transport.send(
         "POST", "session/{session_id}/window/rect".format(**vars(session)),
         rect)