web-platform-tests · juliandescottes · May 16, 2023 · May 16, 2023 · May 16, 2023
diff --git a/lint.ignore b/lint.ignore
@@ -656,7 +656,7 @@ TESTHARNESS-IN-OTHER-TYPE: svg/svg-in-svg/svg-in-svg-circular-filter-reference-c
 # Adding the testharnessreport.js script causes the test to never complete.
 MISSING-TESTHARNESSREPORT: accessibility/crashtests/computed-node-checked.html
 
-PRINT STATEMENT: webdriver/tests/print/*
+PRINT STATEMENT: webdriver/tests/classic/print/*
 PRINT STATEMENT: webdriver/tests/bidi/browsing_context/print/*
 PRINT STATEMENT: webdriver/tests/support/fixtures_bidi.py
 

diff --git a/webdriver/tests/accept_alert/__init__.py → ...er/tests/classic/accept_alert/__init__.py b/webdriver/tests/accept_alert/__init__.py → ...er/tests/classic/accept_alert/__init__.py
diff --git a/webdriver/tests/accept_alert/accept.py → ...iver/tests/classic/accept_alert/accept.py b/webdriver/tests/accept_alert/accept.py → ...iver/tests/classic/accept_alert/accept.py
diff --git a/webdriver/tests/add_cookie/__init__.py → ...iver/tests/classic/add_cookie/__init__.py b/webdriver/tests/add_cookie/__init__.py → ...iver/tests/classic/add_cookie/__init__.py
diff --git a/webdriver/tests/add_cookie/add.py → webdriver/tests/classic/add_cookie/add.py b/webdriver/tests/add_cookie/add.py → webdriver/tests/classic/add_cookie/add.py
diff --git a/webdriver/tests/add_cookie/user_prompts.py → .../tests/classic/add_cookie/user_prompts.py b/webdriver/tests/add_cookie/user_prompts.py → .../tests/classic/add_cookie/user_prompts.py
diff --git a/webdriver/tests/back/__init__.py → webdriver/tests/classic/back/__init__.py b/webdriver/tests/back/__init__.py → webdriver/tests/classic/back/__init__.py
diff --git a/webdriver/tests/back/back.py → webdriver/tests/classic/back/back.py b/webdriver/tests/back/back.py → webdriver/tests/classic/back/back.py
diff --git a/webdriver/tests/back/conftest.py → webdriver/tests/classic/back/conftest.py b/webdriver/tests/back/conftest.py → webdriver/tests/classic/back/conftest.py
diff --git a/webdriver/tests/back/user_prompts.py → webdriver/tests/classic/back/user_prompts.py b/webdriver/tests/back/user_prompts.py → webdriver/tests/classic/back/user_prompts.py
diff --git a/webdriver/tests/close_window/__init__.py → ...er/tests/classic/close_window/__init__.py b/webdriver/tests/close_window/__init__.py → ...er/tests/classic/close_window/__init__.py
diff --git a/webdriver/tests/close_window/close.py → ...river/tests/classic/close_window/close.py b/webdriver/tests/close_window/close.py → ...river/tests/classic/close_window/close.py
diff --git a/webdriver/tests/close_window/user_prompts.py → ...ests/classic/close_window/user_prompts.py b/webdriver/tests/close_window/user_prompts.py → ...ests/classic/close_window/user_prompts.py
diff --git a/...iver/tests/delete_all_cookies/__init__.py → ...ts/classic/delete_all_cookies/__init__.py b/...iver/tests/delete_all_cookies/__init__.py → ...ts/classic/delete_all_cookies/__init__.py
diff --git a/webdriver/tests/delete_all_cookies/delete.py → ...ests/classic/delete_all_cookies/delete.py b/webdriver/tests/delete_all_cookies/delete.py → ...ests/classic/delete_all_cookies/delete.py
diff --git a/.../tests/delete_all_cookies/user_prompts.py → ...lassic/delete_all_cookies/user_prompts.py b/.../tests/delete_all_cookies/user_prompts.py → ...lassic/delete_all_cookies/user_prompts.py
diff --git a/webdriver/tests/delete_cookie/__init__.py → ...r/tests/classic/delete_cookie/__init__.py b/webdriver/tests/delete_cookie/__init__.py → ...r/tests/classic/delete_cookie/__init__.py
diff --git a/webdriver/tests/delete_cookie/delete.py → ...ver/tests/classic/delete_cookie/delete.py b/webdriver/tests/delete_cookie/delete.py → ...ver/tests/classic/delete_cookie/delete.py
diff --git a/...river/tests/delete_cookie/user_prompts.py → ...sts/classic/delete_cookie/user_prompts.py b/...river/tests/delete_cookie/user_prompts.py → ...sts/classic/delete_cookie/user_prompts.py
diff --git a/webdriver/tests/delete_session/__init__.py → .../tests/classic/delete_session/__init__.py b/webdriver/tests/delete_session/__init__.py → .../tests/classic/delete_session/__init__.py
diff --git a/webdriver/tests/delete_session/delete.py → ...er/tests/classic/delete_session/delete.py b/webdriver/tests/delete_session/delete.py → ...er/tests/classic/delete_session/delete.py
diff --git a/webdriver/tests/dismiss_alert/__init__.py → ...r/tests/classic/dismiss_alert/__init__.py b/webdriver/tests/dismiss_alert/__init__.py → ...r/tests/classic/dismiss_alert/__init__.py
diff --git a/webdriver/tests/dismiss_alert/dismiss.py → ...er/tests/classic/dismiss_alert/dismiss.py b/webdriver/tests/dismiss_alert/dismiss.py → ...er/tests/classic/dismiss_alert/dismiss.py
diff --git a/webdriver/tests/element_clear/__init__.py → ...r/tests/classic/element_clear/__init__.py b/webdriver/tests/element_clear/__init__.py → ...r/tests/classic/element_clear/__init__.py
diff --git a/webdriver/tests/element_clear/clear.py → ...iver/tests/classic/element_clear/clear.py b/webdriver/tests/element_clear/clear.py → ...iver/tests/classic/element_clear/clear.py
diff --git a/...river/tests/element_clear/user_prompts.py → ...sts/classic/element_clear/user_prompts.py b/...river/tests/element_clear/user_prompts.py → ...sts/classic/element_clear/user_prompts.py
diff --git a/webdriver/tests/element_click/__init__.py → ...r/tests/classic/element_click/__init__.py b/webdriver/tests/element_click/__init__.py → ...r/tests/classic/element_click/__init__.py
diff --git a/webdriver/tests/element_click/bubbling.py → ...r/tests/classic/element_click/bubbling.py b/webdriver/tests/element_click/bubbling.py → ...r/tests/classic/element_click/bubbling.py
diff --git a/...river/tests/element_click/center_point.py → ...sts/classic/element_click/center_point.py b/...river/tests/element_click/center_point.py → ...sts/classic/element_click/center_point.py
diff --git a/webdriver/tests/element_click/click.py → ...iver/tests/classic/element_click/click.py b/webdriver/tests/element_click/click.py → ...iver/tests/classic/element_click/click.py
diff --git a/webdriver/tests/element_click/events.py → ...ver/tests/classic/element_click/events.py b/webdriver/tests/element_click/events.py → ...ver/tests/classic/element_click/events.py
@@ -2,20 +2,27 @@
 from tests.support.asserts import assert_success
 from tests.support.helpers import filter_dict
 
+
 def get_events(session):
     """Return list of mouse events recorded in the fixture."""
     return session.execute_script("return allEvents.events;") or []
 
+
 def element_click(session, element):
     return session.transport.send(
-        "POST", "session/{session_id}/element/{element_id}/click".format(
-            session_id=session.session_id,
-            element_id=element.id))
+        "POST",
+        "session/{session_id}/element/{element_id}/click".format(
+            session_id=session.session_id, element_id=element.id
+        ),
+    )
+
 
 def test_event_mousemove(session, url):
-    session.url = url("/webdriver/tests/element_click/support/test_click_wdspec.html")
+    session.url = url(
+        "/webdriver/tests/classic/element_click/support/test_click_wdspec.html"
+    )
 
-    element = session.find.css('#outer', all=False)
+    element = session.find.css("#outer", all=False)
     response = element_click(session, element)
     assert_success(response)
 

diff --git a/webdriver/tests/element_click/file_upload.py → ...ests/classic/element_click/file_upload.py b/webdriver/tests/element_click/file_upload.py → ...ests/classic/element_click/file_upload.py
diff --git a/...er/tests/element_click/interactability.py → .../classic/element_click/interactability.py b/...er/tests/element_click/interactability.py → .../classic/element_click/interactability.py
diff --git a/webdriver/tests/element_click/navigate.py → ...r/tests/classic/element_click/navigate.py b/webdriver/tests/element_click/navigate.py → ...r/tests/classic/element_click/navigate.py
@@ -15,7 +15,7 @@ def element_click(session, element):
 
 
 def test_numbers_link(session, server_config, inline):
-    link = "/webdriver/tests/element_click/support/input.html"
+    link = "/webdriver/tests/classic/element_click/support/input.html"
     session.url = inline("<a href={url}>123456</a>".format(url=link))
     element = session.find.css("a", all=False)
     response = element_click(session, element)
@@ -27,7 +27,7 @@ def test_numbers_link(session, server_config, inline):
 
 
 def test_multi_line_link(session, server_config, inline):
-    link = "/webdriver/tests/element_click/support/input.html"
+    link = "/webdriver/tests/classic/element_click/support/input.html"
     session.url = inline("""
         <p style="background-color: yellow; width: 50px;">
             <a href={url}>Helloooooooooooooooooooo Worlddddddddddddddd</a>
@@ -42,7 +42,7 @@ def test_multi_line_link(session, server_config, inline):
 
 
 def test_link_unload_event(session, server_config, inline):
-    link = "/webdriver/tests/element_click/support/input.html"
+    link = "/webdriver/tests/classic/element_click/support/input.html"
     session.url = inline("""
         <body onunload="checkUnload()">
             <a href={url}>click here</a>

diff --git a/...r/tests/element_click/scroll_into_view.py → ...classic/element_click/scroll_into_view.py b/...r/tests/element_click/scroll_into_view.py → ...classic/element_click/scroll_into_view.py
diff --git a/webdriver/tests/element_click/select.py → ...ver/tests/classic/element_click/select.py b/webdriver/tests/element_click/select.py → ...ver/tests/classic/element_click/select.py
diff --git a/webdriver/tests/element_click/shadow_dom.py → ...tests/classic/element_click/shadow_dom.py b/webdriver/tests/element_click/shadow_dom.py → ...tests/classic/element_click/shadow_dom.py
diff --git a/...er/tests/element_click/support/input.html → .../classic/element_click/support/input.html b/...er/tests/element_click/support/input.html → .../classic/element_click/support/input.html
diff --git a/...ment_click/support/test_click_wdspec.html → ...ment_click/support/test_click_wdspec.html b/...ment_click/support/test_click_wdspec.html → ...ment_click/support/test_click_wdspec.html
diff --git a/...river/tests/element_click/user_prompts.py → ...sts/classic/element_click/user_prompts.py b/...river/tests/element_click/user_prompts.py → ...sts/classic/element_click/user_prompts.py
diff --git a/...river/tests/element_send_keys/__init__.py → ...sts/classic/element_send_keys/__init__.py b/...river/tests/element_send_keys/__init__.py → ...sts/classic/element_send_keys/__init__.py
diff --git a/...river/tests/element_send_keys/conftest.py → ...sts/classic/element_send_keys/conftest.py b/...river/tests/element_send_keys/conftest.py → ...sts/classic/element_send_keys/conftest.py
diff --git a/...sts/element_send_keys/content_editable.py → ...sic/element_send_keys/content_editable.py b/...sts/element_send_keys/content_editable.py → ...sic/element_send_keys/content_editable.py
diff --git a/webdriver/tests/element_send_keys/events.py → ...tests/classic/element_send_keys/events.py b/webdriver/tests/element_send_keys/events.py → ...tests/classic/element_send_keys/events.py
diff --git a/...er/tests/element_send_keys/file_upload.py → .../classic/element_send_keys/file_upload.py b/...er/tests/element_send_keys/file_upload.py → .../classic/element_send_keys/file_upload.py
diff --git a/.../tests/element_send_keys/form_controls.py → ...lassic/element_send_keys/form_controls.py b/.../tests/element_send_keys/form_controls.py → ...lassic/element_send_keys/form_controls.py
diff --git a/...ests/element_send_keys/interactability.py → ...ssic/element_send_keys/interactability.py b/...ests/element_send_keys/interactability.py → ...ssic/element_send_keys/interactability.py
diff --git a/...sts/element_send_keys/scroll_into_view.py → ...sic/element_send_keys/scroll_into_view.py b/...sts/element_send_keys/scroll_into_view.py → ...sic/element_send_keys/scroll_into_view.py
diff --git a/...iver/tests/element_send_keys/send_keys.py → ...ts/classic/element_send_keys/send_keys.py b/...iver/tests/element_send_keys/send_keys.py → ...ts/classic/element_send_keys/send_keys.py
diff --git a/...r/tests/element_send_keys/user_prompts.py → ...classic/element_send_keys/user_prompts.py b/...r/tests/element_send_keys/user_prompts.py → ...classic/element_send_keys/user_prompts.py
diff --git a/...er/tests/execute_async_script/__init__.py → .../classic/execute_async_script/__init__.py b/...er/tests/execute_async_script/__init__.py → .../classic/execute_async_script/__init__.py
diff --git a/...r/tests/execute_async_script/arguments.py → ...classic/execute_async_script/arguments.py b/...r/tests/execute_async_script/arguments.py → ...classic/execute_async_script/arguments.py
diff --git a/...tests/execute_async_script/collections.py → ...assic/execute_async_script/collections.py b/...tests/execute_async_script/collections.py → ...assic/execute_async_script/collections.py
diff --git a/...iver/tests/execute_async_script/cyclic.py → ...ts/classic/execute_async_script/cyclic.py b/...iver/tests/execute_async_script/cyclic.py → ...ts/classic/execute_async_script/cyclic.py
diff --git a/...sts/execute_async_script/execute_async.py → ...sic/execute_async_script/execute_async.py b/...sts/execute_async_script/execute_async.py → ...sic/execute_async_script/execute_async.py
diff --git a/webdriver/tests/execute_async_script/node.py → ...ests/classic/execute_async_script/node.py b/webdriver/tests/execute_async_script/node.py → ...ests/classic/execute_async_script/node.py
diff --git a/...ver/tests/execute_async_script/objects.py → ...s/classic/execute_async_script/objects.py b/...ver/tests/execute_async_script/objects.py → ...s/classic/execute_async_script/objects.py
diff --git a/...ver/tests/execute_async_script/promise.py → ...s/classic/execute_async_script/promise.py b/...ver/tests/execute_async_script/promise.py → ...s/classic/execute_async_script/promise.py
diff --git a/.../tests/execute_async_script/properties.py → ...lassic/execute_async_script/properties.py b/.../tests/execute_async_script/properties.py → ...lassic/execute_async_script/properties.py
diff --git a/...ests/execute_async_script/user_prompts.py → ...ssic/execute_async_script/user_prompts.py b/...ests/execute_async_script/user_prompts.py → ...ssic/execute_async_script/user_prompts.py
diff --git a/webdriver/tests/execute_script/__init__.py → .../tests/classic/execute_script/__init__.py b/webdriver/tests/execute_script/__init__.py → .../tests/classic/execute_script/__init__.py
diff --git a/webdriver/tests/execute_script/arguments.py → ...tests/classic/execute_script/arguments.py b/webdriver/tests/execute_script/arguments.py → ...tests/classic/execute_script/arguments.py
diff --git a/...river/tests/execute_script/collections.py → ...sts/classic/execute_script/collections.py b/...river/tests/execute_script/collections.py → ...sts/classic/execute_script/collections.py
diff --git a/webdriver/tests/execute_script/cyclic.py → ...er/tests/classic/execute_script/cyclic.py b/webdriver/tests/execute_script/cyclic.py → ...er/tests/classic/execute_script/cyclic.py
diff --git a/webdriver/tests/execute_script/execute.py → ...r/tests/classic/execute_script/execute.py b/webdriver/tests/execute_script/execute.py → ...r/tests/classic/execute_script/execute.py
diff --git a/...cute_script/json_serialize_windowproxy.py → ...cute_script/json_serialize_windowproxy.py b/...cute_script/json_serialize_windowproxy.py → ...cute_script/json_serialize_windowproxy.py
diff --git a/webdriver/tests/execute_script/node.py → ...iver/tests/classic/execute_script/node.py b/webdriver/tests/execute_script/node.py → ...iver/tests/classic/execute_script/node.py
diff --git a/webdriver/tests/execute_script/objects.py → ...r/tests/classic/execute_script/objects.py b/webdriver/tests/execute_script/objects.py → ...r/tests/classic/execute_script/objects.py
diff --git a/webdriver/tests/execute_script/promise.py → ...r/tests/classic/execute_script/promise.py b/webdriver/tests/execute_script/promise.py → ...r/tests/classic/execute_script/promise.py
diff --git a/webdriver/tests/execute_script/properties.py → ...ests/classic/execute_script/properties.py b/webdriver/tests/execute_script/properties.py → ...ests/classic/execute_script/properties.py
diff --git a/...iver/tests/execute_script/user_prompts.py → ...ts/classic/execute_script/user_prompts.py b/...iver/tests/execute_script/user_prompts.py → ...ts/classic/execute_script/user_prompts.py
diff --git a/webdriver/tests/find_element/__init__.py → ...er/tests/classic/find_element/__init__.py b/webdriver/tests/find_element/__init__.py → ...er/tests/classic/find_element/__init__.py
diff --git a/webdriver/tests/find_element/find.py → webdriver/tests/classic/find_element/find.py b/webdriver/tests/find_element/find.py → webdriver/tests/classic/find_element/find.py
diff --git a/webdriver/tests/find_element/user_prompts.py → ...ests/classic/find_element/user_prompts.py b/webdriver/tests/find_element/user_prompts.py → ...ests/classic/find_element/user_prompts.py
diff --git a/...sts/find_element_from_element/__init__.py → ...sic/find_element_from_element/__init__.py b/...sts/find_element_from_element/__init__.py → ...sic/find_element_from_element/__init__.py
diff --git a/...r/tests/find_element_from_element/find.py → ...classic/find_element_from_element/find.py b/...r/tests/find_element_from_element/find.py → ...classic/find_element_from_element/find.py
diff --git a/...find_element_from_element/user_prompts.py → ...find_element_from_element/user_prompts.py b/...find_element_from_element/user_prompts.py → ...find_element_from_element/user_prompts.py
diff --git a/...find_element_from_shadow_root/__init__.py → ...find_element_from_shadow_root/__init__.py b/...find_element_from_shadow_root/__init__.py → ...find_element_from_shadow_root/__init__.py
diff --git a/...sts/find_element_from_shadow_root/find.py → ...sic/find_element_from_shadow_root/find.py b/...sts/find_element_from_shadow_root/find.py → ...sic/find_element_from_shadow_root/find.py
diff --git a/..._element_from_shadow_root/user_prompts.py → ..._element_from_shadow_root/user_prompts.py b/..._element_from_shadow_root/user_prompts.py → ..._element_from_shadow_root/user_prompts.py
diff --git a/webdriver/tests/find_elements/__init__.py → ...r/tests/classic/find_elements/__init__.py b/webdriver/tests/find_elements/__init__.py → ...r/tests/classic/find_elements/__init__.py
diff --git a/webdriver/tests/find_elements/find.py → ...river/tests/classic/find_elements/find.py b/webdriver/tests/find_elements/find.py → ...river/tests/classic/find_elements/find.py
diff --git a/...river/tests/find_elements/user_prompts.py → ...sts/classic/find_elements/user_prompts.py b/...river/tests/find_elements/user_prompts.py → ...sts/classic/find_elements/user_prompts.py
diff --git a/...ts/find_elements_from_element/__init__.py → ...ic/find_elements_from_element/__init__.py b/...ts/find_elements_from_element/__init__.py → ...ic/find_elements_from_element/__init__.py
diff --git a/.../tests/find_elements_from_element/find.py → ...lassic/find_elements_from_element/find.py b/.../tests/find_elements_from_element/find.py → ...lassic/find_elements_from_element/find.py
diff --git a/...ind_elements_from_element/user_prompts.py → ...ind_elements_from_element/user_prompts.py b/...ind_elements_from_element/user_prompts.py → ...ind_elements_from_element/user_prompts.py
diff --git a/...ind_elements_from_shadow_root/__init__.py → ...ind_elements_from_shadow_root/__init__.py b/...ind_elements_from_shadow_root/__init__.py → ...ind_elements_from_shadow_root/__init__.py
diff --git a/...ts/find_elements_from_shadow_root/find.py → ...ic/find_elements_from_shadow_root/find.py b/...ts/find_elements_from_shadow_root/find.py → ...ic/find_elements_from_shadow_root/find.py
diff --git a/...elements_from_shadow_root/user_prompts.py → ...elements_from_shadow_root/user_prompts.py b/...elements_from_shadow_root/user_prompts.py → ...elements_from_shadow_root/user_prompts.py
diff --git a/webdriver/tests/forward/__init__.py → webdriver/tests/classic/forward/__init__.py b/webdriver/tests/forward/__init__.py → webdriver/tests/classic/forward/__init__.py
diff --git a/webdriver/tests/forward/conftest.py → webdriver/tests/classic/forward/conftest.py b/webdriver/tests/forward/conftest.py → webdriver/tests/classic/forward/conftest.py
diff --git a/webdriver/tests/forward/forward.py → webdriver/tests/classic/forward/forward.py b/webdriver/tests/forward/forward.py → webdriver/tests/classic/forward/forward.py
diff --git a/webdriver/tests/forward/user_prompts.py → ...ver/tests/classic/forward/user_prompts.py b/webdriver/tests/forward/user_prompts.py → ...ver/tests/classic/forward/user_prompts.py
diff --git a/...river/tests/fullscreen_window/__init__.py → ...sts/classic/fullscreen_window/__init__.py b/...river/tests/fullscreen_window/__init__.py → ...sts/classic/fullscreen_window/__init__.py
diff --git a/...ver/tests/fullscreen_window/fullscreen.py → ...s/classic/fullscreen_window/fullscreen.py b/...ver/tests/fullscreen_window/fullscreen.py → ...s/classic/fullscreen_window/fullscreen.py
diff --git a/webdriver/tests/fullscreen_window/stress.py → ...tests/classic/fullscreen_window/stress.py b/webdriver/tests/fullscreen_window/stress.py → ...tests/classic/fullscreen_window/stress.py
diff --git a/...r/tests/fullscreen_window/user_prompts.py → ...classic/fullscreen_window/user_prompts.py b/...r/tests/fullscreen_window/user_prompts.py → ...classic/fullscreen_window/user_prompts.py
diff --git a/...iver/tests/get_active_element/__init__.py → ...ts/classic/get_active_element/__init__.py b/...iver/tests/get_active_element/__init__.py → ...ts/classic/get_active_element/__init__.py
diff --git a/webdriver/tests/get_active_element/get.py → ...r/tests/classic/get_active_element/get.py b/webdriver/tests/get_active_element/get.py → ...r/tests/classic/get_active_element/get.py
diff --git a/.../tests/get_active_element/user_prompts.py → ...lassic/get_active_element/user_prompts.py b/.../tests/get_active_element/user_prompts.py → ...lassic/get_active_element/user_prompts.py
diff --git a/webdriver/tests/get_alert_text/__init__.py → .../tests/classic/get_alert_text/__init__.py b/webdriver/tests/get_alert_text/__init__.py → .../tests/classic/get_alert_text/__init__.py
diff --git a/webdriver/tests/get_alert_text/get.py → ...river/tests/classic/get_alert_text/get.py b/webdriver/tests/get_alert_text/get.py → ...river/tests/classic/get_alert_text/get.py
diff --git a/...iver/tests/get_computed_label/__init__.py → ...ts/classic/get_computed_label/__init__.py b/...iver/tests/get_computed_label/__init__.py → ...ts/classic/get_computed_label/__init__.py
diff --git a/webdriver/tests/get_computed_label/get.py → ...r/tests/classic/get_computed_label/get.py b/webdriver/tests/get_computed_label/get.py → ...r/tests/classic/get_computed_label/get.py
diff --git a/...river/tests/get_computed_role/__init__.py → ...sts/classic/get_computed_role/__init__.py b/...river/tests/get_computed_role/__init__.py → ...sts/classic/get_computed_role/__init__.py
diff --git a/webdriver/tests/get_computed_role/get.py → ...er/tests/classic/get_computed_role/get.py b/webdriver/tests/get_computed_role/get.py → ...er/tests/classic/get_computed_role/get.py
diff --git a/webdriver/tests/get_current_url/__init__.py → ...tests/classic/get_current_url/__init__.py b/webdriver/tests/get_current_url/__init__.py → ...tests/classic/get_current_url/__init__.py
diff --git a/webdriver/tests/get_current_url/file.py → ...ver/tests/classic/get_current_url/file.py b/webdriver/tests/get_current_url/file.py → ...ver/tests/classic/get_current_url/file.py
diff --git a/webdriver/tests/get_current_url/get.py → ...iver/tests/classic/get_current_url/get.py b/webdriver/tests/get_current_url/get.py → ...iver/tests/classic/get_current_url/get.py
diff --git a/webdriver/tests/get_current_url/iframe.py → ...r/tests/classic/get_current_url/iframe.py b/webdriver/tests/get_current_url/iframe.py → ...r/tests/classic/get_current_url/iframe.py
diff --git a/...ver/tests/get_current_url/user_prompts.py → ...s/classic/get_current_url/user_prompts.py b/...ver/tests/get_current_url/user_prompts.py → ...s/classic/get_current_url/user_prompts.py
diff --git a/...r/tests/get_element_attribute/__init__.py → ...classic/get_element_attribute/__init__.py b/...r/tests/get_element_attribute/__init__.py → ...classic/get_element_attribute/__init__.py
diff --git a/webdriver/tests/get_element_attribute/get.py → ...ests/classic/get_element_attribute/get.py b/webdriver/tests/get_element_attribute/get.py → ...ests/classic/get_element_attribute/get.py
diff --git a/...sts/get_element_attribute/user_prompts.py → ...sic/get_element_attribute/user_prompts.py b/...sts/get_element_attribute/user_prompts.py → ...sic/get_element_attribute/user_prompts.py
diff --git a/...r/tests/get_element_css_value/__init__.py → ...classic/get_element_css_value/__init__.py b/...r/tests/get_element_css_value/__init__.py → ...classic/get_element_css_value/__init__.py
diff --git a/webdriver/tests/get_element_css_value/get.py → ...ests/classic/get_element_css_value/get.py b/webdriver/tests/get_element_css_value/get.py → ...ests/classic/get_element_css_value/get.py
diff --git a/...sts/get_element_css_value/user_prompts.py → ...sic/get_element_css_value/user_prompts.py b/...sts/get_element_css_value/user_prompts.py → ...sic/get_element_css_value/user_prompts.py
diff --git a/...er/tests/get_element_property/__init__.py → .../classic/get_element_property/__init__.py b/...er/tests/get_element_property/__init__.py → .../classic/get_element_property/__init__.py
diff --git a/webdriver/tests/get_element_property/get.py → ...tests/classic/get_element_property/get.py b/webdriver/tests/get_element_property/get.py → ...tests/classic/get_element_property/get.py
diff --git a/...ests/get_element_property/user_prompts.py → ...ssic/get_element_property/user_prompts.py b/...ests/get_element_property/user_prompts.py → ...ssic/get_element_property/user_prompts.py
diff --git a/webdriver/tests/get_element_rect/__init__.py → ...ests/classic/get_element_rect/__init__.py b/webdriver/tests/get_element_rect/__init__.py → ...ests/classic/get_element_rect/__init__.py
diff --git a/webdriver/tests/get_element_rect/get.py → ...ver/tests/classic/get_element_rect/get.py b/webdriver/tests/get_element_rect/get.py → ...ver/tests/classic/get_element_rect/get.py
diff --git a/...er/tests/get_element_rect/user_prompts.py → .../classic/get_element_rect/user_prompts.py b/...er/tests/get_element_rect/user_prompts.py → .../classic/get_element_rect/user_prompts.py
diff --git a/...tests/get_element_shadow_root/__init__.py → ...assic/get_element_shadow_root/__init__.py b/...tests/get_element_shadow_root/__init__.py → ...assic/get_element_shadow_root/__init__.py
diff --git a/...iver/tests/get_element_shadow_root/get.py → ...ts/classic/get_element_shadow_root/get.py b/...iver/tests/get_element_shadow_root/get.py → ...ts/classic/get_element_shadow_root/get.py
diff --git a/...s/get_element_shadow_root/user_prompts.py → ...c/get_element_shadow_root/user_prompts.py b/...s/get_element_shadow_root/user_prompts.py → ...c/get_element_shadow_root/user_prompts.py
diff --git a/...er/tests/get_element_tag_name/__init__.py → .../classic/get_element_tag_name/__init__.py b/...er/tests/get_element_tag_name/__init__.py → .../classic/get_element_tag_name/__init__.py
diff --git a/webdriver/tests/get_element_tag_name/get.py → ...tests/classic/get_element_tag_name/get.py b/webdriver/tests/get_element_tag_name/get.py → ...tests/classic/get_element_tag_name/get.py
diff --git a/...ests/get_element_tag_name/user_prompts.py → ...ssic/get_element_tag_name/user_prompts.py b/...ests/get_element_tag_name/user_prompts.py → ...ssic/get_element_tag_name/user_prompts.py
diff --git a/webdriver/tests/get_element_text/__init__.py → ...ests/classic/get_element_text/__init__.py b/webdriver/tests/get_element_text/__init__.py → ...ests/classic/get_element_text/__init__.py
diff --git a/webdriver/tests/get_element_text/get.py → ...ver/tests/classic/get_element_text/get.py b/webdriver/tests/get_element_text/get.py → ...ver/tests/classic/get_element_text/get.py
diff --git a/...er/tests/get_element_text/user_prompts.py → .../classic/get_element_text/user_prompts.py b/...er/tests/get_element_text/user_prompts.py → .../classic/get_element_text/user_prompts.py
diff --git a/webdriver/tests/get_named_cookie/__init__.py → ...ests/classic/get_named_cookie/__init__.py b/webdriver/tests/get_named_cookie/__init__.py → ...ests/classic/get_named_cookie/__init__.py
diff --git a/webdriver/tests/get_named_cookie/get.py → ...ver/tests/classic/get_named_cookie/get.py b/webdriver/tests/get_named_cookie/get.py → ...ver/tests/classic/get_named_cookie/get.py
diff --git a/...er/tests/get_named_cookie/user_prompts.py → .../classic/get_named_cookie/user_prompts.py b/...er/tests/get_named_cookie/user_prompts.py → .../classic/get_named_cookie/user_prompts.py
diff --git a/webdriver/tests/get_page_source/__init__.py → ...tests/classic/get_page_source/__init__.py b/webdriver/tests/get_page_source/__init__.py → ...tests/classic/get_page_source/__init__.py
diff --git a/webdriver/tests/get_page_source/source.py → ...r/tests/classic/get_page_source/source.py b/webdriver/tests/get_page_source/source.py → ...r/tests/classic/get_page_source/source.py
diff --git a/...ver/tests/get_page_source/user_prompts.py → ...s/classic/get_page_source/user_prompts.py b/...ver/tests/get_page_source/user_prompts.py → ...s/classic/get_page_source/user_prompts.py
diff --git a/webdriver/tests/get_timeouts/__init__.py → ...er/tests/classic/get_timeouts/__init__.py b/webdriver/tests/get_timeouts/__init__.py → ...er/tests/classic/get_timeouts/__init__.py
diff --git a/webdriver/tests/get_timeouts/get.py → webdriver/tests/classic/get_timeouts/get.py b/webdriver/tests/get_timeouts/get.py → webdriver/tests/classic/get_timeouts/get.py
diff --git a/webdriver/tests/get_title/__init__.py → ...river/tests/classic/get_title/__init__.py b/webdriver/tests/get_title/__init__.py → ...river/tests/classic/get_title/__init__.py
diff --git a/webdriver/tests/get_title/get.py → webdriver/tests/classic/get_title/get.py b/webdriver/tests/get_title/get.py → webdriver/tests/classic/get_title/get.py
diff --git a/webdriver/tests/get_title/iframe.py → webdriver/tests/classic/get_title/iframe.py b/webdriver/tests/get_title/iframe.py → webdriver/tests/classic/get_title/iframe.py
diff --git a/webdriver/tests/get_title/user_prompts.py → ...r/tests/classic/get_title/user_prompts.py b/webdriver/tests/get_title/user_prompts.py → ...r/tests/classic/get_title/user_prompts.py
diff --git a/...river/tests/get_window_handle/__init__.py → ...sts/classic/get_window_handle/__init__.py b/...river/tests/get_window_handle/__init__.py → ...sts/classic/get_window_handle/__init__.py
diff --git a/webdriver/tests/get_window_handle/get.py → ...er/tests/classic/get_window_handle/get.py b/webdriver/tests/get_window_handle/get.py → ...er/tests/classic/get_window_handle/get.py
diff --git a/...r/tests/get_window_handle/user_prompts.py → ...classic/get_window_handle/user_prompts.py b/...r/tests/get_window_handle/user_prompts.py → ...classic/get_window_handle/user_prompts.py
diff --git a/...iver/tests/get_window_handles/__init__.py → ...ts/classic/get_window_handles/__init__.py b/...iver/tests/get_window_handles/__init__.py → ...ts/classic/get_window_handles/__init__.py
diff --git a/webdriver/tests/get_window_handles/get.py → ...r/tests/classic/get_window_handles/get.py b/webdriver/tests/get_window_handles/get.py → ...r/tests/classic/get_window_handles/get.py
diff --git a/.../tests/get_window_handles/user_prompts.py → ...lassic/get_window_handles/user_prompts.py b/.../tests/get_window_handles/user_prompts.py → ...lassic/get_window_handles/user_prompts.py
diff --git a/webdriver/tests/get_window_rect/__init__.py → ...tests/classic/get_window_rect/__init__.py b/webdriver/tests/get_window_rect/__init__.py → ...tests/classic/get_window_rect/__init__.py
diff --git a/webdriver/tests/get_window_rect/get.py → ...iver/tests/classic/get_window_rect/get.py b/webdriver/tests/get_window_rect/get.py → ...iver/tests/classic/get_window_rect/get.py
diff --git a/...ver/tests/get_window_rect/user_prompts.py → ...s/classic/get_window_rect/user_prompts.py b/...ver/tests/get_window_rect/user_prompts.py → ...s/classic/get_window_rect/user_prompts.py
diff --git a/webdriver/tests/idlharness.window.js → webdriver/tests/classic/idlharness.window.js b/webdriver/tests/idlharness.window.js → webdriver/tests/classic/idlharness.window.js
diff --git a/webdriver/tests/interface/interface.py → ...iver/tests/classic/interface/interface.py b/webdriver/tests/interface/interface.py → ...iver/tests/classic/interface/interface.py
diff --git a/...iver/tests/is_element_enabled/__init__.py → ...ts/classic/is_element_enabled/__init__.py b/...iver/tests/is_element_enabled/__init__.py → ...ts/classic/is_element_enabled/__init__.py
diff --git a/...river/tests/is_element_enabled/enabled.py → ...sts/classic/is_element_enabled/enabled.py b/...river/tests/is_element_enabled/enabled.py → ...sts/classic/is_element_enabled/enabled.py
diff --git a/.../tests/is_element_enabled/user_prompts.py → ...lassic/is_element_enabled/user_prompts.py b/.../tests/is_element_enabled/user_prompts.py → ...lassic/is_element_enabled/user_prompts.py
diff --git a/...ver/tests/is_element_selected/__init__.py → ...s/classic/is_element_selected/__init__.py b/...ver/tests/is_element_selected/__init__.py → ...s/classic/is_element_selected/__init__.py
diff --git a/...ver/tests/is_element_selected/selected.py → ...s/classic/is_element_selected/selected.py b/...ver/tests/is_element_selected/selected.py → ...s/classic/is_element_selected/selected.py
diff --git a/...tests/is_element_selected/user_prompts.py → ...assic/is_element_selected/user_prompts.py b/...tests/is_element_selected/user_prompts.py → ...assic/is_element_selected/user_prompts.py
diff --git a/webdriver/tests/maximize_window/__init__.py → ...tests/classic/maximize_window/__init__.py b/webdriver/tests/maximize_window/__init__.py → ...tests/classic/maximize_window/__init__.py
diff --git a/webdriver/tests/maximize_window/maximize.py → ...tests/classic/maximize_window/maximize.py b/webdriver/tests/maximize_window/maximize.py → ...tests/classic/maximize_window/maximize.py
diff --git a/webdriver/tests/maximize_window/stress.py → ...r/tests/classic/maximize_window/stress.py b/webdriver/tests/maximize_window/stress.py → ...r/tests/classic/maximize_window/stress.py
diff --git a/...ver/tests/maximize_window/user_prompts.py → ...s/classic/maximize_window/user_prompts.py b/...ver/tests/maximize_window/user_prompts.py → ...s/classic/maximize_window/user_prompts.py
diff --git a/webdriver/tests/minimize_window/__init__.py → ...tests/classic/minimize_window/__init__.py b/webdriver/tests/minimize_window/__init__.py → ...tests/classic/minimize_window/__init__.py
diff --git a/webdriver/tests/minimize_window/minimize.py → ...tests/classic/minimize_window/minimize.py b/webdriver/tests/minimize_window/minimize.py → ...tests/classic/minimize_window/minimize.py
diff --git a/webdriver/tests/minimize_window/stress.py → ...r/tests/classic/minimize_window/stress.py b/webdriver/tests/minimize_window/stress.py → ...r/tests/classic/minimize_window/stress.py
diff --git a/...ver/tests/minimize_window/user_prompts.py → ...s/classic/minimize_window/user_prompts.py b/...ver/tests/minimize_window/user_prompts.py → ...s/classic/minimize_window/user_prompts.py
diff --git a/webdriver/tests/navigate_to/__init__.py → ...ver/tests/classic/navigate_to/__init__.py b/webdriver/tests/navigate_to/__init__.py → ...ver/tests/classic/navigate_to/__init__.py
diff --git a/webdriver/tests/navigate_to/file.py → webdriver/tests/classic/navigate_to/file.py b/webdriver/tests/navigate_to/file.py → webdriver/tests/classic/navigate_to/file.py
diff --git a/webdriver/tests/navigate_to/navigate.py → ...ver/tests/classic/navigate_to/navigate.py b/webdriver/tests/navigate_to/navigate.py → ...ver/tests/classic/navigate_to/navigate.py
diff --git a/webdriver/tests/navigate_to/user_prompts.py → ...tests/classic/navigate_to/user_prompts.py b/webdriver/tests/navigate_to/user_prompts.py → ...tests/classic/navigate_to/user_prompts.py
diff --git a/webdriver/tests/new_session/__init__.py → ...ver/tests/classic/new_session/__init__.py b/webdriver/tests/new_session/__init__.py → ...ver/tests/classic/new_session/__init__.py
diff --git a/webdriver/tests/new_session/conftest.py → ...ver/tests/classic/new_session/conftest.py b/webdriver/tests/new_session/conftest.py → ...ver/tests/classic/new_session/conftest.py
diff --git a/...r/tests/new_session/create_alwaysMatch.py → ...classic/new_session/create_alwaysMatch.py b/...r/tests/new_session/create_alwaysMatch.py → ...classic/new_session/create_alwaysMatch.py
@@ -5,7 +5,7 @@
 from .conftest import product, flatten
 
 from tests.support.asserts import assert_success
-from tests.new_session.support.create import valid_data
+from tests.classic.new_session.support.create import valid_data
 
 
 @pytest.mark.parametrize("key,value", flatten(product(*item) for item in valid_data))

diff --git a/...er/tests/new_session/create_firstMatch.py → .../classic/new_session/create_firstMatch.py b/...er/tests/new_session/create_firstMatch.py → .../classic/new_session/create_firstMatch.py
@@ -6,7 +6,7 @@
 
 
 from tests.support.asserts import assert_success
-from tests.new_session.support.create import valid_data
+from tests.classic.new_session.support.create import valid_data
 
 
 @pytest.mark.parametrize("key,value", flatten(product(*item) for item in valid_data))

diff --git a/...river/tests/new_session/default_values.py → ...sts/classic/new_session/default_values.py b/...river/tests/new_session/default_values.py → ...sts/classic/new_session/default_values.py
diff --git a/...tests/new_session/invalid_capabilities.py → ...assic/new_session/invalid_capabilities.py b/...tests/new_session/invalid_capabilities.py → ...assic/new_session/invalid_capabilities.py
@@ -2,7 +2,7 @@
 
 from .conftest import product, flatten
 
-from tests.new_session.support.create import invalid_data, invalid_extensions
+from tests.classic.new_session.support.create import invalid_data, invalid_extensions
 from tests.support.asserts import assert_error
 
 

diff --git a/webdriver/tests/new_session/merge.py → webdriver/tests/classic/new_session/merge.py b/webdriver/tests/new_session/merge.py → webdriver/tests/classic/new_session/merge.py
diff --git a/...r/tests/new_session/page_load_strategy.py → ...classic/new_session/page_load_strategy.py b/...r/tests/new_session/page_load_strategy.py → ...classic/new_session/page_load_strategy.py
diff --git a/webdriver/tests/new_session/platform_name.py → ...ests/classic/new_session/platform_name.py b/webdriver/tests/new_session/platform_name.py → ...ests/classic/new_session/platform_name.py
diff --git a/webdriver/tests/new_session/response.py → ...ver/tests/classic/new_session/response.py b/webdriver/tests/new_session/response.py → ...ver/tests/classic/new_session/response.py
diff --git a/...ver/tests/new_session/support/__init__.py → ...s/classic/new_session/support/__init__.py b/...ver/tests/new_session/support/__init__.py → ...s/classic/new_session/support/__init__.py
diff --git a/...river/tests/new_session/support/create.py → ...sts/classic/new_session/support/create.py b/...river/tests/new_session/support/create.py → ...sts/classic/new_session/support/create.py
diff --git a/webdriver/tests/new_session/timeouts.py → ...ver/tests/classic/new_session/timeouts.py b/webdriver/tests/new_session/timeouts.py → ...ver/tests/classic/new_session/timeouts.py
diff --git a/webdriver/tests/new_session/websocket_url.py → ...ests/classic/new_session/websocket_url.py b/webdriver/tests/new_session/websocket_url.py → ...ests/classic/new_session/websocket_url.py
diff --git a/webdriver/tests/new_window/__init__.py → ...iver/tests/classic/new_window/__init__.py b/webdriver/tests/new_window/__init__.py → ...iver/tests/classic/new_window/__init__.py
diff --git a/webdriver/tests/new_window/new.py → webdriver/tests/classic/new_window/new.py b/webdriver/tests/new_window/new.py → webdriver/tests/classic/new_window/new.py
diff --git a/webdriver/tests/new_window/new_tab.py → ...river/tests/classic/new_window/new_tab.py b/webdriver/tests/new_window/new_tab.py → ...river/tests/classic/new_window/new_tab.py
diff --git a/webdriver/tests/new_window/new_window.py → ...er/tests/classic/new_window/new_window.py b/webdriver/tests/new_window/new_window.py → ...er/tests/classic/new_window/new_window.py
diff --git a/webdriver/tests/new_window/user_prompts.py → .../tests/classic/new_window/user_prompts.py b/webdriver/tests/new_window/user_prompts.py → .../tests/classic/new_window/user_prompts.py
diff --git a/webdriver/tests/perform_actions/__init__.py → ...tests/classic/perform_actions/__init__.py b/webdriver/tests/perform_actions/__init__.py → ...tests/classic/perform_actions/__init__.py
diff --git a/webdriver/tests/perform_actions/conftest.py → ...tests/classic/perform_actions/conftest.py b/webdriver/tests/perform_actions/conftest.py → ...tests/classic/perform_actions/conftest.py
diff --git a/webdriver/tests/perform_actions/key.py → ...iver/tests/classic/perform_actions/key.py b/webdriver/tests/perform_actions/key.py → ...iver/tests/classic/perform_actions/key.py
@@ -2,7 +2,7 @@
 
 from webdriver.error import NoSuchWindowException
 
-from tests.perform_actions.support.refine import get_keys
+from tests.classic.perform_actions.support.refine import get_keys
 from tests.support.keys import Keys
 
 

diff --git a/...river/tests/perform_actions/key_events.py → ...sts/classic/perform_actions/key_events.py b/...river/tests/perform_actions/key_events.py → ...sts/classic/perform_actions/key_events.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from tests.perform_actions.support.refine import get_events, get_keys
+from tests.classic.perform_actions.support.refine import get_events, get_keys
 from tests.support.helpers import filter_dict, filter_supported_key_events
 from tests.support.keys import ALL_EVENTS, ALTERNATIVE_KEY_NAMES, Keys
 

diff --git a/...er/tests/perform_actions/key_modifiers.py → .../classic/perform_actions/key_modifiers.py b/...er/tests/perform_actions/key_modifiers.py → .../classic/perform_actions/key_modifiers.py
diff --git a/...er/tests/perform_actions/key_shortcuts.py → .../classic/perform_actions/key_shortcuts.py b/...er/tests/perform_actions/key_shortcuts.py → .../classic/perform_actions/key_shortcuts.py
@@ -1,4 +1,4 @@
-from tests.perform_actions.support.refine import get_keys
+from tests.classic.perform_actions.support.refine import get_keys
 from tests.support.keys import Keys
 
 

diff --git a/...tests/perform_actions/key_special_keys.py → ...assic/perform_actions/key_special_keys.py b/...tests/perform_actions/key_special_keys.py → ...assic/perform_actions/key_special_keys.py
@@ -2,7 +2,7 @@
 
 from webdriver import error
 
-from tests.perform_actions.support.refine import get_keys
+from tests.classic.perform_actions.support.refine import get_keys
 
 
 @pytest.mark.parametrize("value", [

diff --git a/webdriver/tests/perform_actions/none.py → ...ver/tests/classic/perform_actions/none.py b/webdriver/tests/perform_actions/none.py → ...ver/tests/classic/perform_actions/none.py
diff --git a/...ts/perform_actions/pointer_contextmenu.py → ...ic/perform_actions/pointer_contextmenu.py b/...ts/perform_actions/pointer_contextmenu.py → ...ic/perform_actions/pointer_contextmenu.py
@@ -1,6 +1,6 @@
 import pytest
 
-from tests.perform_actions.support.refine import get_events
+from tests.classic.perform_actions.support.refine import get_events
 from tests.support.helpers import filter_dict
 from tests.support.keys import Keys
 

diff --git a/...tests/perform_actions/pointer_dblclick.py → ...assic/perform_actions/pointer_dblclick.py b/...tests/perform_actions/pointer_dblclick.py → ...assic/perform_actions/pointer_dblclick.py
@@ -1,6 +1,6 @@
 import pytest
 
-from tests.perform_actions.support.refine import get_events
+from tests.classic.perform_actions.support.refine import get_events
 from tests.support.asserts import assert_move_to_coordinates
 from tests.support.helpers import filter_dict
 

diff --git a/...perform_actions/pointer_modifier_click.py → ...perform_actions/pointer_modifier_click.py b/...perform_actions/pointer_modifier_click.py → ...perform_actions/pointer_modifier_click.py
@@ -1,6 +1,6 @@
 import pytest
 
-from tests.perform_actions.support.refine import get_events
+from tests.classic.perform_actions.support.refine import get_events
 from tests.support.helpers import filter_dict
 from tests.support.keys import Keys
 

diff --git a/...er/tests/perform_actions/pointer_mouse.py → .../classic/perform_actions/pointer_mouse.py b/...er/tests/perform_actions/pointer_mouse.py → .../classic/perform_actions/pointer_mouse.py
@@ -4,8 +4,8 @@
 
 from webdriver.error import InvalidArgumentException, NoSuchWindowException, StaleElementReferenceException
 
-from tests.perform_actions.support.mouse import get_inview_center, get_viewport_rect
-from tests.perform_actions.support.refine import get_events
+from tests.classic.perform_actions.support.mouse import get_inview_center, get_viewport_rect
+from tests.classic.perform_actions.support.refine import get_events
 from tests.support.asserts import assert_move_to_coordinates
 from tests.support.helpers import filter_dict
 from tests.support.sync import Poll

diff --git a/...r/tests/perform_actions/pointer_origin.py → ...classic/perform_actions/pointer_origin.py b/...r/tests/perform_actions/pointer_origin.py → ...classic/perform_actions/pointer_origin.py
@@ -2,7 +2,7 @@
 
 from webdriver import MoveTargetOutOfBoundsException
 
-from tests.perform_actions.support.mouse import get_inview_center, get_viewport_rect
+from tests.classic.perform_actions.support.mouse import get_inview_center, get_viewport_rect
 
 
 def get_click_coordinates(session):

diff --git a/...perform_actions/pointer_pause_dblclick.py → ...perform_actions/pointer_pause_dblclick.py b/...perform_actions/pointer_pause_dblclick.py → ...perform_actions/pointer_pause_dblclick.py
@@ -1,5 +1,5 @@
-from tests.perform_actions.support.mouse import get_inview_center, get_viewport_rect
-from tests.perform_actions.support.refine import get_events
+from tests.classic.perform_actions.support.mouse import get_inview_center, get_viewport_rect
+from tests.classic.perform_actions.support.refine import get_events
 from tests.support.helpers import filter_dict
 
 _DBLCLICK_INTERVAL = 640

diff --git a/...iver/tests/perform_actions/pointer_pen.py → ...ts/classic/perform_actions/pointer_pen.py b/...iver/tests/perform_actions/pointer_pen.py → ...ts/classic/perform_actions/pointer_pen.py
@@ -4,8 +4,8 @@
 
 from webdriver.error import NoSuchWindowException, StaleElementReferenceException
 
-from tests.perform_actions.support.mouse import get_inview_center, get_viewport_rect
-from tests.perform_actions.support.refine import get_events
+from tests.classic.perform_actions.support.mouse import get_inview_center, get_viewport_rect
+from tests.classic.perform_actions.support.refine import get_events
 
 
 def test_null_response_value(session, pen_chain):

diff --git a/...er/tests/perform_actions/pointer_touch.py → .../classic/perform_actions/pointer_touch.py b/...er/tests/perform_actions/pointer_touch.py → .../classic/perform_actions/pointer_touch.py
@@ -3,8 +3,8 @@
 import pytest
 
 from webdriver.error import NoSuchWindowException, StaleElementReferenceException
-from tests.perform_actions.support.mouse import get_inview_center, get_viewport_rect
-from tests.perform_actions.support.refine import get_events
+from tests.classic.perform_actions.support.mouse import get_inview_center, get_viewport_rect
+from tests.classic.perform_actions.support.refine import get_events
 
 
 def test_null_response_value(session, touch_chain):

diff --git a/...ts/perform_actions/pointer_tripleclick.py → ...ic/perform_actions/pointer_tripleclick.py b/...ts/perform_actions/pointer_tripleclick.py → ...ic/perform_actions/pointer_tripleclick.py
@@ -1,6 +1,6 @@
 import math
 
-from tests.perform_actions.support.refine import get_events
+from tests.classic.perform_actions.support.refine import get_events
 from tests.support.asserts import assert_move_to_coordinates
 from tests.support.helpers import filter_dict
 

diff --git a/webdriver/tests/perform_actions/sequence.py → ...tests/classic/perform_actions/sequence.py b/webdriver/tests/perform_actions/sequence.py → ...tests/classic/perform_actions/sequence.py
@@ -1,6 +1,6 @@
 # META: timeout=long
 
-from tests.perform_actions.support.refine import get_events, get_keys
+from tests.classic.perform_actions.support.refine import get_events, get_keys
 
 
 def test_perform_no_actions_send_no_events(session, key_reporter, key_chain):

diff --git a/...tests/perform_actions/support/__init__.py → ...assic/perform_actions/support/__init__.py b/...tests/perform_actions/support/__init__.py → ...assic/perform_actions/support/__init__.py
diff --git a/...er/tests/perform_actions/support/mouse.py → .../classic/perform_actions/support/mouse.py b/...er/tests/perform_actions/support/mouse.py → .../classic/perform_actions/support/mouse.py
diff --git a/...r/tests/perform_actions/support/refine.py → ...classic/perform_actions/support/refine.py b/...r/tests/perform_actions/support/refine.py → ...classic/perform_actions/support/refine.py
diff --git a/...ver/tests/perform_actions/user_prompts.py → ...s/classic/perform_actions/user_prompts.py b/...ver/tests/perform_actions/user_prompts.py → ...s/classic/perform_actions/user_prompts.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from tests.perform_actions.support.refine import get_keys
+from tests.classic.perform_actions.support.refine import get_keys
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
 
 

diff --git a/webdriver/tests/perform_actions/validity.py → ...tests/classic/perform_actions/validity.py b/webdriver/tests/perform_actions/validity.py → ...tests/classic/perform_actions/validity.py
diff --git a/webdriver/tests/perform_actions/wheel.py → ...er/tests/classic/perform_actions/wheel.py b/webdriver/tests/perform_actions/wheel.py → ...er/tests/classic/perform_actions/wheel.py
@@ -2,7 +2,7 @@
 
 from webdriver.error import InvalidArgumentException, NoSuchWindowException
 
-from tests.perform_actions.support.refine import get_events
+from tests.classic.perform_actions.support.refine import get_events
 from tests.support.asserts import assert_move_to_coordinates
 from tests.support.helpers import filter_dict
 

diff --git a/webdriver/tests/permissions/__init__.py → ...ver/tests/classic/permissions/__init__.py b/webdriver/tests/permissions/__init__.py → ...ver/tests/classic/permissions/__init__.py
diff --git a/webdriver/tests/permissions/set.py → webdriver/tests/classic/permissions/set.py b/webdriver/tests/permissions/set.py → webdriver/tests/classic/permissions/set.py
diff --git a/webdriver/tests/print/__init__.py → webdriver/tests/classic/print/__init__.py b/webdriver/tests/print/__init__.py → webdriver/tests/classic/print/__init__.py
diff --git a/webdriver/tests/print/background.py → webdriver/tests/classic/print/background.py b/webdriver/tests/print/background.py → webdriver/tests/classic/print/background.py
diff --git a/webdriver/tests/print/orientation.py → webdriver/tests/classic/print/orientation.py b/webdriver/tests/print/orientation.py → webdriver/tests/classic/print/orientation.py
diff --git a/webdriver/tests/print/printcmd.py → webdriver/tests/classic/print/printcmd.py b/webdriver/tests/print/printcmd.py → webdriver/tests/classic/print/printcmd.py
diff --git a/webdriver/tests/print/user_prompts.py → ...river/tests/classic/print/user_prompts.py b/webdriver/tests/print/user_prompts.py → ...river/tests/classic/print/user_prompts.py
diff --git a/webdriver/tests/refresh/__init__.py → webdriver/tests/classic/refresh/__init__.py b/webdriver/tests/refresh/__init__.py → webdriver/tests/classic/refresh/__init__.py
diff --git a/webdriver/tests/refresh/refresh.py → webdriver/tests/classic/refresh/refresh.py b/webdriver/tests/refresh/refresh.py → webdriver/tests/classic/refresh/refresh.py
diff --git a/webdriver/tests/refresh/user_prompts.py → ...ver/tests/classic/refresh/user_prompts.py b/webdriver/tests/refresh/user_prompts.py → ...ver/tests/classic/refresh/user_prompts.py
diff --git a/webdriver/tests/release_actions/__init__.py → ...tests/classic/release_actions/__init__.py b/webdriver/tests/release_actions/__init__.py → ...tests/classic/release_actions/__init__.py
diff --git a/webdriver/tests/release_actions/conftest.py → ...tests/classic/release_actions/conftest.py b/webdriver/tests/release_actions/conftest.py → ...tests/classic/release_actions/conftest.py
diff --git a/webdriver/tests/release_actions/release.py → .../tests/classic/release_actions/release.py b/webdriver/tests/release_actions/release.py → .../tests/classic/release_actions/release.py
diff --git a/webdriver/tests/release_actions/sequence.py → ...tests/classic/release_actions/sequence.py b/webdriver/tests/release_actions/sequence.py → ...tests/classic/release_actions/sequence.py
@@ -1,6 +1,6 @@
 # META: timeout=long
 
-from tests.release_actions.support.refine import get_events, get_keys
+from tests.classic.release_actions.support.refine import get_events, get_keys
 from tests.support.helpers import filter_dict, filter_supported_key_events
 
 

diff --git a/...tests/release_actions/support/__init__.py → ...assic/release_actions/support/__init__.py b/...tests/release_actions/support/__init__.py → ...assic/release_actions/support/__init__.py
diff --git a/...r/tests/release_actions/support/refine.py → ...classic/release_actions/support/refine.py b/...r/tests/release_actions/support/refine.py → ...classic/release_actions/support/refine.py
diff --git a/webdriver/tests/send_alert_text/__init__.py → ...tests/classic/send_alert_text/__init__.py b/webdriver/tests/send_alert_text/__init__.py → ...tests/classic/send_alert_text/__init__.py
diff --git a/webdriver/tests/send_alert_text/conftest.py → ...tests/classic/send_alert_text/conftest.py b/webdriver/tests/send_alert_text/conftest.py → ...tests/classic/send_alert_text/conftest.py
diff --git a/webdriver/tests/send_alert_text/send.py → ...ver/tests/classic/send_alert_text/send.py b/webdriver/tests/send_alert_text/send.py → ...ver/tests/classic/send_alert_text/send.py
diff --git a/webdriver/tests/set_timeouts/__init__.py → ...er/tests/classic/set_timeouts/__init__.py b/webdriver/tests/set_timeouts/__init__.py → ...er/tests/classic/set_timeouts/__init__.py
diff --git a/webdriver/tests/set_timeouts/set.py → webdriver/tests/classic/set_timeouts/set.py b/webdriver/tests/set_timeouts/set.py → webdriver/tests/classic/set_timeouts/set.py
diff --git a/webdriver/tests/set_timeouts/user_prompts.py → ...ests/classic/set_timeouts/user_prompts.py b/webdriver/tests/set_timeouts/user_prompts.py → ...ests/classic/set_timeouts/user_prompts.py
diff --git a/webdriver/tests/set_window_rect/__init__.py → ...tests/classic/set_window_rect/__init__.py b/webdriver/tests/set_window_rect/__init__.py → ...tests/classic/set_window_rect/__init__.py
diff --git a/webdriver/tests/set_window_rect/set.py → ...iver/tests/classic/set_window_rect/set.py b/webdriver/tests/set_window_rect/set.py → ...iver/tests/classic/set_window_rect/set.py
diff --git a/...ver/tests/set_window_rect/user_prompts.py → ...s/classic/set_window_rect/user_prompts.py b/...ver/tests/set_window_rect/user_prompts.py → ...s/classic/set_window_rect/user_prompts.py
diff --git a/webdriver/tests/status/__init__.py → webdriver/tests/classic/status/__init__.py b/webdriver/tests/status/__init__.py → webdriver/tests/classic/status/__init__.py
diff --git a/webdriver/tests/status/status.py → webdriver/tests/classic/status/status.py b/webdriver/tests/status/status.py → webdriver/tests/classic/status/status.py
diff --git a/webdriver/tests/switch_to_frame/__init__.py → ...tests/classic/switch_to_frame/__init__.py b/webdriver/tests/switch_to_frame/__init__.py → ...tests/classic/switch_to_frame/__init__.py
diff --git a/...ver/tests/switch_to_frame/cross_origin.py → ...s/classic/switch_to_frame/cross_origin.py b/...ver/tests/switch_to_frame/cross_origin.py → ...s/classic/switch_to_frame/cross_origin.py
diff --git a/webdriver/tests/switch_to_frame/switch.py → ...r/tests/classic/switch_to_frame/switch.py b/webdriver/tests/switch_to_frame/switch.py → ...r/tests/classic/switch_to_frame/switch.py
diff --git a/...er/tests/switch_to_frame/switch_number.py → .../classic/switch_to_frame/switch_number.py b/...er/tests/switch_to_frame/switch_number.py → .../classic/switch_to_frame/switch_number.py
diff --git a/...ests/switch_to_frame/switch_webelement.py → ...ssic/switch_to_frame/switch_webelement.py b/...ests/switch_to_frame/switch_webelement.py → ...ssic/switch_to_frame/switch_webelement.py
diff --git a/.../tests/switch_to_parent_frame/__init__.py → ...lassic/switch_to_parent_frame/__init__.py b/.../tests/switch_to_parent_frame/__init__.py → ...lassic/switch_to_parent_frame/__init__.py
diff --git a/...er/tests/switch_to_parent_frame/switch.py → .../classic/switch_to_parent_frame/switch.py b/...er/tests/switch_to_parent_frame/switch.py → .../classic/switch_to_parent_frame/switch.py
diff --git a/webdriver/tests/switch_to_window/__init__.py → ...ests/classic/switch_to_window/__init__.py b/webdriver/tests/switch_to_window/__init__.py → ...ests/classic/switch_to_window/__init__.py
diff --git a/webdriver/tests/switch_to_window/alerts.py → .../tests/classic/switch_to_window/alerts.py b/webdriver/tests/switch_to_window/alerts.py → .../tests/classic/switch_to_window/alerts.py
diff --git a/webdriver/tests/switch_to_window/switch.py → .../tests/classic/switch_to_window/switch.py b/webdriver/tests/switch_to_window/switch.py → .../tests/classic/switch_to_window/switch.py
diff --git a/...tests/take_element_screenshot/__init__.py → ...assic/take_element_screenshot/__init__.py b/...tests/take_element_screenshot/__init__.py → ...assic/take_element_screenshot/__init__.py
diff --git a/...r/tests/take_element_screenshot/iframe.py → ...classic/take_element_screenshot/iframe.py b/...r/tests/take_element_screenshot/iframe.py → ...classic/take_element_screenshot/iframe.py
diff --git a/...sts/take_element_screenshot/screenshot.py → ...sic/take_element_screenshot/screenshot.py b/...sts/take_element_screenshot/screenshot.py → ...sic/take_element_screenshot/screenshot.py
diff --git a/...s/take_element_screenshot/user_prompts.py → ...c/take_element_screenshot/user_prompts.py b/...s/take_element_screenshot/user_prompts.py → ...c/take_element_screenshot/user_prompts.py
diff --git a/webdriver/tests/take_screenshot/__init__.py → ...tests/classic/take_screenshot/__init__.py b/webdriver/tests/take_screenshot/__init__.py → ...tests/classic/take_screenshot/__init__.py
diff --git a/webdriver/tests/take_screenshot/iframe.py → ...r/tests/classic/take_screenshot/iframe.py b/webdriver/tests/take_screenshot/iframe.py → ...r/tests/classic/take_screenshot/iframe.py
diff --git a/...river/tests/take_screenshot/screenshot.py → ...sts/classic/take_screenshot/screenshot.py b/...river/tests/take_screenshot/screenshot.py → ...sts/classic/take_screenshot/screenshot.py
diff --git a/...ver/tests/take_screenshot/user_prompts.py → ...s/classic/take_screenshot/user_prompts.py b/...ver/tests/take_screenshot/user_prompts.py → ...s/classic/take_screenshot/user_prompts.py