diff --git a/circle.yml b/circle.yml
index 542cc4fb79..300659ceaa 100644
--- a/circle.yml
+++ b/circle.yml
@@ -425,7 +425,20 @@ commands:
     steps:
       - restore_cached_workspace
       - run:
-          command: yarn workspace @packages/server test ./test/e2e/$(( $CIRCLE_NODE_INDEX ))_*spec* --browser <<parameters.browser>>
+          command: |
+            ALL_SPECS=`circleci tests glob "/root/cypress/packages/server/test/e2e/*spec*"`
+            SPECS=
+            for file in $ALL_SPECS; do
+              # filter out non_root tests, they have their own stage
+              if [[ "$file" == *"non_root"* ]]; then
+                echo "Skipping $file"
+                continue
+              fi
+              SPECS="$SPECS $file"
+            done
+            SPECS=`echo $SPECS | xargs -n 1 | circleci tests split --split-by=timings`
+            echo SPECS=$SPECS
+            yarn workspace @packages/server test $SPECS --browser <<parameters.browser>>
       - verify-mocha-results
       - store_test_results:
           path: /tmp/cypress
diff --git a/packages/server/README.md b/packages/server/README.md
index c6ba8a3688..286f09925b 100644
--- a/packages/server/README.md
+++ b/packages/server/README.md
@@ -73,12 +73,12 @@ yarn test-integration cli_spec ## shorthand, uses globbing to find spec
 yarn test <path/to/test>
 yarn test test/e2e/1_async_timeouts_spec.js
 ## or
-yarn test-e2e 1_async ## shorthand, uses globbing to find spec
+yarn test-e2e async_timeouts ## shorthand, uses globbing to find spec
 ```
 
 To keep the browser open after a spec run (for easier debugging and iterating on specs), you can pass the `--no-exit` flag to the e2e test command. Live reloading due to spec changes should also work:
 ```sh
-yarn test test/e2e/2_go_spec.js --browser chrome --no-exit
+yarn test test/e2e/go_spec.js --browser chrome --no-exit
 ```
 
 ### Updating snaphots
@@ -88,5 +88,5 @@ Prepend `SNAPSHOT_UPDATE=1` to any test command. See [`snap-shot-it` instruction
 ```bash
 SNAPSHOT_UPDATE=1 yarn test test/unit/api_spec.js
 SNAPSHOT_UPDATE=1 yarn test test/integration/cli_spec.js
-SNAPSHOT_UPDATE=1 yarn test-e2e 1_async
+SNAPSHOT_UPDATE=1 yarn test-e2e async_timeout
 ```
diff --git a/packages/server/__snapshots__/1_async_timeouts_spec.js b/packages/server/__snapshots__/async_timeouts_spec.js
similarity index 100%
rename from packages/server/__snapshots__/1_async_timeouts_spec.js
rename to packages/server/__snapshots__/async_timeouts_spec.js
diff --git a/packages/server/__snapshots__/1_base_url_spec.js b/packages/server/__snapshots__/base_url_spec.js
similarity index 100%
rename from packages/server/__snapshots__/1_base_url_spec.js
rename to packages/server/__snapshots__/base_url_spec.js
diff --git a/packages/server/__snapshots__/4_before_browser_launch_spec.ts.js b/packages/server/__snapshots__/before_browser_launch_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/4_before_browser_launch_spec.ts.js
rename to packages/server/__snapshots__/before_browser_launch_spec.ts.js
diff --git a/packages/server/__snapshots__/1_block_hosts_spec.js b/packages/server/__snapshots__/block_hosts_spec.js
similarity index 100%
rename from packages/server/__snapshots__/1_block_hosts_spec.js
rename to packages/server/__snapshots__/block_hosts_spec.js
diff --git a/packages/server/__snapshots__/4_browser_path_spec.js b/packages/server/__snapshots__/browser_path_spec.js
similarity index 100%
rename from packages/server/__snapshots__/4_browser_path_spec.js
rename to packages/server/__snapshots__/browser_path_spec.js
diff --git a/packages/server/__snapshots__/1_busted_support_file_spec.js b/packages/server/__snapshots__/busted_support_file_spec.js
similarity index 100%
rename from packages/server/__snapshots__/1_busted_support_file_spec.js
rename to packages/server/__snapshots__/busted_support_file_spec.js
diff --git a/packages/server/__snapshots__/1_cache_spec.js b/packages/server/__snapshots__/cache_spec.js
similarity index 100%
rename from packages/server/__snapshots__/1_cache_spec.js
rename to packages/server/__snapshots__/cache_spec.js
diff --git a/packages/server/__snapshots__/1_caught_uncaught_hook_errors_spec.js b/packages/server/__snapshots__/caught_uncaught_hook_errors_spec.js
similarity index 100%
rename from packages/server/__snapshots__/1_caught_uncaught_hook_errors_spec.js
rename to packages/server/__snapshots__/caught_uncaught_hook_errors_spec.js
diff --git a/packages/server/__snapshots__/5_cdp_spec.ts.js b/packages/server/__snapshots__/cdp_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/5_cdp_spec.ts.js
rename to packages/server/__snapshots__/cdp_spec.ts.js
diff --git a/packages/server/__snapshots__/1_commands_outside_of_test_spec.js b/packages/server/__snapshots__/commands_outside_of_test_spec.js
similarity index 100%
rename from packages/server/__snapshots__/1_commands_outside_of_test_spec.js
rename to packages/server/__snapshots__/commands_outside_of_test_spec.js
diff --git a/packages/server/__snapshots__/0_component_tests_spec.js b/packages/server/__snapshots__/component_tests_spec.js
similarity index 100%
rename from packages/server/__snapshots__/0_component_tests_spec.js
rename to packages/server/__snapshots__/component_tests_spec.js
diff --git a/packages/server/__snapshots__/3_config_spec.js b/packages/server/__snapshots__/config_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_config_spec.js
rename to packages/server/__snapshots__/config_spec.js
diff --git a/packages/server/__snapshots__/4_controllers_spec.js b/packages/server/__snapshots__/controllers_spec.js
similarity index 100%
rename from packages/server/__snapshots__/4_controllers_spec.js
rename to packages/server/__snapshots__/controllers_spec.js
diff --git a/packages/server/__snapshots__/2_cookies_spec.ts.js b/packages/server/__snapshots__/cookies_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/2_cookies_spec.ts.js
rename to packages/server/__snapshots__/cookies_spec.ts.js
diff --git a/packages/server/__snapshots__/1_deprecated_spec.ts.js b/packages/server/__snapshots__/deprecated_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/1_deprecated_spec.ts.js
rename to packages/server/__snapshots__/deprecated_spec.ts.js
diff --git a/packages/server/__snapshots__/4_domain_spec.js b/packages/server/__snapshots__/domain_spec.js
similarity index 100%
rename from packages/server/__snapshots__/4_domain_spec.js
rename to packages/server/__snapshots__/domain_spec.js
diff --git a/packages/server/__snapshots__/1_es_modules_spec.js b/packages/server/__snapshots__/es_modules_spec.js
similarity index 100%
rename from packages/server/__snapshots__/1_es_modules_spec.js
rename to packages/server/__snapshots__/es_modules_spec.js
diff --git a/packages/server/__snapshots__/4_form_submissions_spec.js b/packages/server/__snapshots__/form_submissions_spec.js
similarity index 100%
rename from packages/server/__snapshots__/4_form_submissions_spec.js
rename to packages/server/__snapshots__/form_submissions_spec.js
diff --git a/packages/server/__snapshots__/0_go_spec.js b/packages/server/__snapshots__/go_spec.js
similarity index 100%
rename from packages/server/__snapshots__/0_go_spec.js
rename to packages/server/__snapshots__/go_spec.js
diff --git a/packages/server/__snapshots__/5_headless_spec.ts.js b/packages/server/__snapshots__/headless_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/5_headless_spec.ts.js
rename to packages/server/__snapshots__/headless_spec.ts.js
diff --git a/packages/server/__snapshots__/1_iframe_spec.js b/packages/server/__snapshots__/iframe_spec.js
similarity index 100%
rename from packages/server/__snapshots__/1_iframe_spec.js
rename to packages/server/__snapshots__/iframe_spec.js
diff --git a/packages/server/__snapshots__/7_images_spec.js b/packages/server/__snapshots__/images_spec.js
similarity index 100%
rename from packages/server/__snapshots__/7_images_spec.js
rename to packages/server/__snapshots__/images_spec.js
diff --git a/packages/server/__snapshots__/1_interception_spec.js b/packages/server/__snapshots__/interception_spec.js
similarity index 100%
rename from packages/server/__snapshots__/1_interception_spec.js
rename to packages/server/__snapshots__/interception_spec.js
diff --git a/packages/server/__snapshots__/3_issue_149_spec.js b/packages/server/__snapshots__/issue_149_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_issue_149_spec.js
rename to packages/server/__snapshots__/issue_149_spec.js
diff --git a/packages/server/__snapshots__/3_issue_1669_spec.js b/packages/server/__snapshots__/issue_1669_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_issue_1669_spec.js
rename to packages/server/__snapshots__/issue_1669_spec.js
diff --git a/packages/server/__snapshots__/3_issue_173_spec.ts.js b/packages/server/__snapshots__/issue_173_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/3_issue_173_spec.ts.js
rename to packages/server/__snapshots__/issue_173_spec.ts.js
diff --git a/packages/server/__snapshots__/3_issue_2891_spec.js b/packages/server/__snapshots__/issue_2891_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_issue_2891_spec.js
rename to packages/server/__snapshots__/issue_2891_spec.js
diff --git a/packages/server/__snapshots__/3_issue_5475_spec.js b/packages/server/__snapshots__/issue_5475_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_issue_5475_spec.js
rename to packages/server/__snapshots__/issue_5475_spec.js
diff --git a/packages/server/__snapshots__/3_issue_6619.ts.js b/packages/server/__snapshots__/issue_6619.ts.js
similarity index 100%
rename from packages/server/__snapshots__/3_issue_6619.ts.js
rename to packages/server/__snapshots__/issue_6619.ts.js
diff --git a/packages/server/__snapshots__/3_issue_674_spec.js b/packages/server/__snapshots__/issue_674_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_issue_674_spec.js
rename to packages/server/__snapshots__/issue_674_spec.js
diff --git a/packages/server/__snapshots__/3_issue_7217_spec.ts.js b/packages/server/__snapshots__/issue_7217_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/3_issue_7217_spec.ts.js
rename to packages/server/__snapshots__/issue_7217_spec.ts.js
diff --git a/packages/server/__snapshots__/3_js_error_handling_spec.js b/packages/server/__snapshots__/js_error_handling_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_js_error_handling_spec.js
rename to packages/server/__snapshots__/js_error_handling_spec.js
diff --git a/packages/server/__snapshots__/0_network_error_handling_spec.js b/packages/server/__snapshots__/network_error_handling_spec.js
similarity index 100%
rename from packages/server/__snapshots__/0_network_error_handling_spec.js
rename to packages/server/__snapshots__/network_error_handling_spec.js
diff --git a/packages/server/__snapshots__/3_new_project_spec.js b/packages/server/__snapshots__/new_project_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_new_project_spec.js
rename to packages/server/__snapshots__/new_project_spec.js
diff --git a/packages/server/__snapshots__/6_non_proxied_spec.ts.js b/packages/server/__snapshots__/non_proxied_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/6_non_proxied_spec.ts.js
rename to packages/server/__snapshots__/non_proxied_spec.ts.js
diff --git a/packages/server/__snapshots__/3_only_spec.js b/packages/server/__snapshots__/only_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_only_spec.js
rename to packages/server/__snapshots__/only_spec.js
diff --git a/packages/server/__snapshots__/3_page_loading_spec.js b/packages/server/__snapshots__/page_loading_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_page_loading_spec.js
rename to packages/server/__snapshots__/page_loading_spec.js
diff --git a/packages/server/__snapshots__/4_plugin_run_events_spec.ts.js b/packages/server/__snapshots__/plugin_run_events_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/4_plugin_run_events_spec.ts.js
rename to packages/server/__snapshots__/plugin_run_events_spec.ts.js
diff --git a/packages/server/__snapshots__/3_plugins_spec.js b/packages/server/__snapshots__/plugins_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_plugins_spec.js
rename to packages/server/__snapshots__/plugins_spec.js
diff --git a/packages/server/__snapshots__/4_promises_spec.js b/packages/server/__snapshots__/promises_spec.js
similarity index 100%
rename from packages/server/__snapshots__/4_promises_spec.js
rename to packages/server/__snapshots__/promises_spec.js
diff --git a/packages/server/__snapshots__/7_record_spec.js b/packages/server/__snapshots__/record_spec.js
similarity index 100%
rename from packages/server/__snapshots__/7_record_spec.js
rename to packages/server/__snapshots__/record_spec.js
diff --git a/packages/server/__snapshots__/0_reporters_spec.js b/packages/server/__snapshots__/reporters_spec.js
similarity index 100%
rename from packages/server/__snapshots__/0_reporters_spec.js
rename to packages/server/__snapshots__/reporters_spec.js
diff --git a/packages/server/__snapshots__/4_request_spec.ts.js b/packages/server/__snapshots__/request_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/4_request_spec.ts.js
rename to packages/server/__snapshots__/request_spec.ts.js
diff --git a/packages/server/__snapshots__/3_retries_spec.ts.js b/packages/server/__snapshots__/retries_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/3_retries_spec.ts.js
rename to packages/server/__snapshots__/retries_spec.ts.js
diff --git a/packages/server/__snapshots__/4_return_value_spec.js b/packages/server/__snapshots__/return_value_spec.js
similarity index 100%
rename from packages/server/__snapshots__/4_return_value_spec.js
rename to packages/server/__snapshots__/return_value_spec.js
diff --git a/packages/server/__snapshots__/3_runnable_execution_spec.ts.js b/packages/server/__snapshots__/runnable_execution_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/3_runnable_execution_spec.ts.js
rename to packages/server/__snapshots__/runnable_execution_spec.ts.js
diff --git a/packages/server/__snapshots__/4_screenshot_element_capture_spec.js b/packages/server/__snapshots__/screenshot_element_capture_spec.js
similarity index 100%
rename from packages/server/__snapshots__/4_screenshot_element_capture_spec.js
rename to packages/server/__snapshots__/screenshot_element_capture_spec.js
diff --git a/packages/server/__snapshots__/4_screenshot_fullpage_capture_spec.js b/packages/server/__snapshots__/screenshot_fullpage_capture_spec.js
similarity index 100%
rename from packages/server/__snapshots__/4_screenshot_fullpage_capture_spec.js
rename to packages/server/__snapshots__/screenshot_fullpage_capture_spec.js
diff --git a/packages/server/__snapshots__/4_screenshot_nested_file_spec.js b/packages/server/__snapshots__/screenshot_nested_file_spec.js
similarity index 100%
rename from packages/server/__snapshots__/4_screenshot_nested_file_spec.js
rename to packages/server/__snapshots__/screenshot_nested_file_spec.js
diff --git a/packages/server/__snapshots__/5_screenshot_viewport_capture_spec.js b/packages/server/__snapshots__/screenshot_viewport_capture_spec.js
similarity index 100%
rename from packages/server/__snapshots__/5_screenshot_viewport_capture_spec.js
rename to packages/server/__snapshots__/screenshot_viewport_capture_spec.js
diff --git a/packages/server/__snapshots__/5_screenshots_spec.js b/packages/server/__snapshots__/screenshots_spec.js
similarity index 100%
rename from packages/server/__snapshots__/5_screenshots_spec.js
rename to packages/server/__snapshots__/screenshots_spec.js
diff --git a/packages/server/__snapshots__/5_server_sent_events_spec.js b/packages/server/__snapshots__/server_sent_events_spec.js
similarity index 100%
rename from packages/server/__snapshots__/5_server_sent_events_spec.js
rename to packages/server/__snapshots__/server_sent_events_spec.js
diff --git a/packages/server/__snapshots__/7_session_spec.ts.js b/packages/server/__snapshots__/session_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/7_session_spec.ts.js
rename to packages/server/__snapshots__/session_spec.ts.js
diff --git a/packages/server/__snapshots__/5_spec_isolation_spec.js b/packages/server/__snapshots__/spec_isolation_spec.js
similarity index 100%
rename from packages/server/__snapshots__/5_spec_isolation_spec.js
rename to packages/server/__snapshots__/spec_isolation_spec.js
diff --git a/packages/server/__snapshots__/5_specs_spec.js b/packages/server/__snapshots__/specs_spec.js
similarity index 100%
rename from packages/server/__snapshots__/5_specs_spec.js
rename to packages/server/__snapshots__/specs_spec.js
diff --git a/packages/server/__snapshots__/5_stdout_spec.js b/packages/server/__snapshots__/stdout_spec.js
similarity index 100%
rename from packages/server/__snapshots__/5_stdout_spec.js
rename to packages/server/__snapshots__/stdout_spec.js
diff --git a/packages/server/__snapshots__/3_studio_spec.ts.js b/packages/server/__snapshots__/studio_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/3_studio_spec.ts.js
rename to packages/server/__snapshots__/studio_spec.ts.js
diff --git a/packages/server/__snapshots__/5_subdomain_spec.ts.js b/packages/server/__snapshots__/subdomain_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/5_subdomain_spec.ts.js
rename to packages/server/__snapshots__/subdomain_spec.ts.js
diff --git a/packages/server/__snapshots__/1_system_node_spec.js b/packages/server/__snapshots__/system_node_spec.js
similarity index 100%
rename from packages/server/__snapshots__/1_system_node_spec.js
rename to packages/server/__snapshots__/system_node_spec.js
diff --git a/packages/server/__snapshots__/5_task_not_registered_spec.js b/packages/server/__snapshots__/task_not_registered_spec.js
similarity index 100%
rename from packages/server/__snapshots__/5_task_not_registered_spec.js
rename to packages/server/__snapshots__/task_not_registered_spec.js
diff --git a/packages/server/__snapshots__/6_task_spec.js b/packages/server/__snapshots__/task_spec.js
similarity index 100%
rename from packages/server/__snapshots__/6_task_spec.js
rename to packages/server/__snapshots__/task_spec.js
diff --git a/packages/server/__snapshots__/3_testConfigOverrides_spec.ts.js b/packages/server/__snapshots__/testConfigOverrides_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/3_testConfigOverrides_spec.ts.js
rename to packages/server/__snapshots__/testConfigOverrides_spec.ts.js
diff --git a/packages/server/__snapshots__/1_typescript_spec_support_spec.ts.js b/packages/server/__snapshots__/typescript_spec_support_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/1_typescript_spec_support_spec.ts.js
rename to packages/server/__snapshots__/typescript_spec_support_spec.ts.js
diff --git a/packages/server/__snapshots__/6_uncaught_spec_errors_spec.js b/packages/server/__snapshots__/uncaught_spec_errors_spec.js
similarity index 100%
rename from packages/server/__snapshots__/6_uncaught_spec_errors_spec.js
rename to packages/server/__snapshots__/uncaught_spec_errors_spec.js
diff --git a/packages/server/__snapshots__/6_uncaught_support_file_spec.js b/packages/server/__snapshots__/uncaught_support_file_spec.js
similarity index 100%
rename from packages/server/__snapshots__/6_uncaught_support_file_spec.js
rename to packages/server/__snapshots__/uncaught_support_file_spec.js
diff --git a/packages/server/__snapshots__/3_user_agent_spec.js b/packages/server/__snapshots__/user_agent_spec.js
similarity index 100%
rename from packages/server/__snapshots__/3_user_agent_spec.js
rename to packages/server/__snapshots__/user_agent_spec.js
diff --git a/packages/server/__snapshots__/6_viewport_spec.js b/packages/server/__snapshots__/viewport_spec.js
similarity index 100%
rename from packages/server/__snapshots__/6_viewport_spec.js
rename to packages/server/__snapshots__/viewport_spec.js
diff --git a/packages/server/__snapshots__/6_visit_spec.js b/packages/server/__snapshots__/visit_spec.js
similarity index 100%
rename from packages/server/__snapshots__/6_visit_spec.js
rename to packages/server/__snapshots__/visit_spec.js
diff --git a/packages/server/__snapshots__/6_web_security_spec.js b/packages/server/__snapshots__/web_security_spec.js
similarity index 100%
rename from packages/server/__snapshots__/6_web_security_spec.js
rename to packages/server/__snapshots__/web_security_spec.js
diff --git a/packages/server/__snapshots__/4_websockets_spec.js b/packages/server/__snapshots__/websockets_spec.js
similarity index 100%
rename from packages/server/__snapshots__/4_websockets_spec.js
rename to packages/server/__snapshots__/websockets_spec.js
diff --git a/packages/server/__snapshots__/4_xhr_spec.js b/packages/server/__snapshots__/xhr_spec.js
similarity index 100%
rename from packages/server/__snapshots__/4_xhr_spec.js
rename to packages/server/__snapshots__/xhr_spec.js
diff --git a/packages/server/test/e2e/1_async_timeouts_spec.js b/packages/server/test/e2e/async_timeouts_spec.js
similarity index 100%
rename from packages/server/test/e2e/1_async_timeouts_spec.js
rename to packages/server/test/e2e/async_timeouts_spec.js
diff --git a/packages/server/test/e2e/1_base_url_spec.js b/packages/server/test/e2e/base_url_spec.js
similarity index 100%
rename from packages/server/test/e2e/1_base_url_spec.js
rename to packages/server/test/e2e/base_url_spec.js
diff --git a/packages/server/test/e2e/4_before_browser_launch_spec.ts b/packages/server/test/e2e/before_browser_launch_spec.ts
similarity index 100%
rename from packages/server/test/e2e/4_before_browser_launch_spec.ts
rename to packages/server/test/e2e/before_browser_launch_spec.ts
diff --git a/packages/server/test/e2e/1_block_hosts_spec.js b/packages/server/test/e2e/block_hosts_spec.js
similarity index 100%
rename from packages/server/test/e2e/1_block_hosts_spec.js
rename to packages/server/test/e2e/block_hosts_spec.js
diff --git a/packages/server/test/e2e/4_browser_path_spec.js b/packages/server/test/e2e/browser_path_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_browser_path_spec.js
rename to packages/server/test/e2e/browser_path_spec.js
diff --git a/packages/server/test/e2e/1_busted_support_file_spec.js b/packages/server/test/e2e/busted_support_file_spec.js
similarity index 100%
rename from packages/server/test/e2e/1_busted_support_file_spec.js
rename to packages/server/test/e2e/busted_support_file_spec.js
diff --git a/packages/server/test/e2e/1_cache_spec.js b/packages/server/test/e2e/cache_spec.js
similarity index 100%
rename from packages/server/test/e2e/1_cache_spec.js
rename to packages/server/test/e2e/cache_spec.js
diff --git a/packages/server/test/e2e/1_caught_uncaught_hook_errors_spec.js b/packages/server/test/e2e/caught_uncaught_hook_errors_spec.js
similarity index 100%
rename from packages/server/test/e2e/1_caught_uncaught_hook_errors_spec.js
rename to packages/server/test/e2e/caught_uncaught_hook_errors_spec.js
diff --git a/packages/server/test/e2e/5_cdp_spec.ts b/packages/server/test/e2e/cdp_spec.ts
similarity index 100%
rename from packages/server/test/e2e/5_cdp_spec.ts
rename to packages/server/test/e2e/cdp_spec.ts
diff --git a/packages/server/test/e2e/1_commands_outside_of_test_spec.js b/packages/server/test/e2e/commands_outside_of_test_spec.js
similarity index 100%
rename from packages/server/test/e2e/1_commands_outside_of_test_spec.js
rename to packages/server/test/e2e/commands_outside_of_test_spec.js
diff --git a/packages/server/test/e2e/3_config_spec.js b/packages/server/test/e2e/config_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_config_spec.js
rename to packages/server/test/e2e/config_spec.js
diff --git a/packages/server/test/e2e/4_controllers_spec.js b/packages/server/test/e2e/controllers_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_controllers_spec.js
rename to packages/server/test/e2e/controllers_spec.js
diff --git a/packages/server/test/e2e/2_cookies_spec.ts b/packages/server/test/e2e/cookies_spec.ts
similarity index 98%
rename from packages/server/test/e2e/2_cookies_spec.ts
rename to packages/server/test/e2e/cookies_spec.ts
index 97539081d8..b2f985560f 100644
--- a/packages/server/test/e2e/2_cookies_spec.ts
+++ b/packages/server/test/e2e/cookies_spec.ts
@@ -144,7 +144,7 @@ foo\
 const haveRoot = !process.env.USE_HIGH_PORTS && (process.geteuid() === 0)
 
 if (!haveRoot) {
-  console.warn('(e2e tests warning) You are not running as root; therefore, 2_cookies_spec cannot cover the case where the default (80/443) HTTP(s) port is used. Alternate ports (2121/2323) will be used instead.')
+  console.warn('(e2e tests warning) You are not running as root; therefore, cookies_spec cannot cover the case where the default (80/443) HTTP(s) port is used. Alternate ports (2121/2323) will be used instead.')
 }
 
 let httpPort = 2121
diff --git a/packages/server/test/e2e/1_deprecated_spec.ts b/packages/server/test/e2e/deprecated_spec.ts
similarity index 100%
rename from packages/server/test/e2e/1_deprecated_spec.ts
rename to packages/server/test/e2e/deprecated_spec.ts
diff --git a/packages/server/test/e2e/4_domain_spec.js b/packages/server/test/e2e/domain_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_domain_spec.js
rename to packages/server/test/e2e/domain_spec.js
diff --git a/packages/server/test/e2e/4_downloads_spec.ts b/packages/server/test/e2e/downloads_spec.ts
similarity index 100%
rename from packages/server/test/e2e/4_downloads_spec.ts
rename to packages/server/test/e2e/downloads_spec.ts
diff --git a/packages/server/test/e2e/0_error_ui_spec.ts b/packages/server/test/e2e/error_ui_spec.ts
similarity index 100%
rename from packages/server/test/e2e/0_error_ui_spec.ts
rename to packages/server/test/e2e/error_ui_spec.ts
diff --git a/packages/server/test/e2e/1_es_modules_spec.js b/packages/server/test/e2e/es_modules_spec.js
similarity index 100%
rename from packages/server/test/e2e/1_es_modules_spec.js
rename to packages/server/test/e2e/es_modules_spec.js
diff --git a/packages/server/test/e2e/0_fetch_polyfill_spec.js b/packages/server/test/e2e/fetch_polyfill_spec.js
similarity index 100%
rename from packages/server/test/e2e/0_fetch_polyfill_spec.js
rename to packages/server/test/e2e/fetch_polyfill_spec.js
diff --git a/packages/server/test/e2e/1_firefox_spec.ts b/packages/server/test/e2e/firefox_spec.ts
similarity index 100%
rename from packages/server/test/e2e/1_firefox_spec.ts
rename to packages/server/test/e2e/firefox_spec.ts
diff --git a/packages/server/test/e2e/4_form_submissions_spec.js b/packages/server/test/e2e/form_submissions_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_form_submissions_spec.js
rename to packages/server/test/e2e/form_submissions_spec.js
diff --git a/packages/server/test/e2e/0_go_spec.js b/packages/server/test/e2e/go_spec.js
similarity index 100%
rename from packages/server/test/e2e/0_go_spec.js
rename to packages/server/test/e2e/go_spec.js
diff --git a/packages/server/test/e2e/5_headless_spec.ts b/packages/server/test/e2e/headless_spec.ts
similarity index 100%
rename from packages/server/test/e2e/5_headless_spec.ts
rename to packages/server/test/e2e/headless_spec.ts
diff --git a/packages/server/test/e2e/1_iframe_spec.js b/packages/server/test/e2e/iframe_spec.js
similarity index 100%
rename from packages/server/test/e2e/1_iframe_spec.js
rename to packages/server/test/e2e/iframe_spec.js
diff --git a/packages/server/test/e2e/7_images_spec.js b/packages/server/test/e2e/images_spec.js
similarity index 100%
rename from packages/server/test/e2e/7_images_spec.js
rename to packages/server/test/e2e/images_spec.js
diff --git a/packages/server/test/e2e/1_interception_spec.js b/packages/server/test/e2e/interception_spec.js
similarity index 100%
rename from packages/server/test/e2e/1_interception_spec.js
rename to packages/server/test/e2e/interception_spec.js
diff --git a/packages/server/test/e2e/3_issue_149_spec.js b/packages/server/test/e2e/issue_149_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_issue_149_spec.js
rename to packages/server/test/e2e/issue_149_spec.js
diff --git a/packages/server/test/e2e/3_issue_1669_spec.js b/packages/server/test/e2e/issue_1669_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_issue_1669_spec.js
rename to packages/server/test/e2e/issue_1669_spec.js
diff --git a/packages/server/test/e2e/3_issue_173_spec.ts b/packages/server/test/e2e/issue_173_spec.ts
similarity index 100%
rename from packages/server/test/e2e/3_issue_173_spec.ts
rename to packages/server/test/e2e/issue_173_spec.ts
diff --git a/packages/server/test/e2e/3_issue_2891_spec.js b/packages/server/test/e2e/issue_2891_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_issue_2891_spec.js
rename to packages/server/test/e2e/issue_2891_spec.js
diff --git a/packages/server/test/e2e/3_issue_5475_spec.js b/packages/server/test/e2e/issue_5475_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_issue_5475_spec.js
rename to packages/server/test/e2e/issue_5475_spec.js
diff --git a/packages/server/test/e2e/3_issue_6619.ts b/packages/server/test/e2e/issue_6619.ts
similarity index 100%
rename from packages/server/test/e2e/3_issue_6619.ts
rename to packages/server/test/e2e/issue_6619.ts
diff --git a/packages/server/test/e2e/3_issue_674_spec.js b/packages/server/test/e2e/issue_674_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_issue_674_spec.js
rename to packages/server/test/e2e/issue_674_spec.js
diff --git a/packages/server/test/e2e/3_issue_7217_spec.ts b/packages/server/test/e2e/issue_7217_spec.ts
similarity index 100%
rename from packages/server/test/e2e/3_issue_7217_spec.ts
rename to packages/server/test/e2e/issue_7217_spec.ts
diff --git a/packages/server/test/e2e/3_issue_7481.ts b/packages/server/test/e2e/issue_7481.ts
similarity index 100%
rename from packages/server/test/e2e/3_issue_7481.ts
rename to packages/server/test/e2e/issue_7481.ts
diff --git a/packages/server/test/e2e/3_issue_8111_spec.js b/packages/server/test/e2e/issue_8111_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_issue_8111_spec.js
rename to packages/server/test/e2e/issue_8111_spec.js
diff --git a/packages/server/test/e2e/3_js_error_handling_spec.js b/packages/server/test/e2e/js_error_handling_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_js_error_handling_spec.js
rename to packages/server/test/e2e/js_error_handling_spec.js
diff --git a/packages/server/test/e2e/0_max_listeners_spec.ts b/packages/server/test/e2e/max_listeners_spec.ts
similarity index 100%
rename from packages/server/test/e2e/0_max_listeners_spec.ts
rename to packages/server/test/e2e/max_listeners_spec.ts
diff --git a/packages/server/test/e2e/0_network_error_handling_spec.js b/packages/server/test/e2e/network_error_handling_spec.js
similarity index 100%
rename from packages/server/test/e2e/0_network_error_handling_spec.js
rename to packages/server/test/e2e/network_error_handling_spec.js
diff --git a/packages/server/test/e2e/3_new_project_spec.js b/packages/server/test/e2e/new_project_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_new_project_spec.js
rename to packages/server/test/e2e/new_project_spec.js
diff --git a/packages/server/test/e2e/5_no_superfluous_screenshots_spec.js b/packages/server/test/e2e/no_superfluous_screenshots_spec.js
similarity index 100%
rename from packages/server/test/e2e/5_no_superfluous_screenshots_spec.js
rename to packages/server/test/e2e/no_superfluous_screenshots_spec.js
diff --git a/packages/server/test/e2e/6_non_proxied_spec.ts b/packages/server/test/e2e/non_proxied_spec.ts
similarity index 100%
rename from packages/server/test/e2e/6_non_proxied_spec.ts
rename to packages/server/test/e2e/non_proxied_spec.ts
diff --git a/packages/server/test/e2e/3_only_spec.js b/packages/server/test/e2e/only_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_only_spec.js
rename to packages/server/test/e2e/only_spec.js
diff --git a/packages/server/test/e2e/3_page_loading_spec.js b/packages/server/test/e2e/page_loading_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_page_loading_spec.js
rename to packages/server/test/e2e/page_loading_spec.js
diff --git a/packages/server/test/e2e/4_plugin_run_events_spec.ts b/packages/server/test/e2e/plugin_run_events_spec.ts
similarity index 100%
rename from packages/server/test/e2e/4_plugin_run_events_spec.ts
rename to packages/server/test/e2e/plugin_run_events_spec.ts
diff --git a/packages/server/test/e2e/3_plugins_spec.js b/packages/server/test/e2e/plugins_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_plugins_spec.js
rename to packages/server/test/e2e/plugins_spec.js
diff --git a/packages/server/test/e2e/4_promises_spec.js b/packages/server/test/e2e/promises_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_promises_spec.js
rename to packages/server/test/e2e/promises_spec.js
diff --git a/packages/server/test/e2e/7_proxying_spec.ts b/packages/server/test/e2e/proxying_spec.ts
similarity index 100%
rename from packages/server/test/e2e/7_proxying_spec.ts
rename to packages/server/test/e2e/proxying_spec.ts
diff --git a/packages/server/test/e2e/7_record_spec.js b/packages/server/test/e2e/record_spec.js
similarity index 100%
rename from packages/server/test/e2e/7_record_spec.js
rename to packages/server/test/e2e/record_spec.js
diff --git a/packages/server/test/e2e/0_reporters_spec.js b/packages/server/test/e2e/reporters_spec.js
similarity index 100%
rename from packages/server/test/e2e/0_reporters_spec.js
rename to packages/server/test/e2e/reporters_spec.js
diff --git a/packages/server/test/e2e/4_request_spec.ts b/packages/server/test/e2e/request_spec.ts
similarity index 100%
rename from packages/server/test/e2e/4_request_spec.ts
rename to packages/server/test/e2e/request_spec.ts
diff --git a/packages/server/test/e2e/3_retries_spec.ts b/packages/server/test/e2e/retries_spec.ts
similarity index 100%
rename from packages/server/test/e2e/3_retries_spec.ts
rename to packages/server/test/e2e/retries_spec.ts
diff --git a/packages/server/test/e2e/4_return_value_spec.js b/packages/server/test/e2e/return_value_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_return_value_spec.js
rename to packages/server/test/e2e/return_value_spec.js
diff --git a/packages/server/test/e2e/7_run_ct_spec.js b/packages/server/test/e2e/run_ct_spec.js
similarity index 100%
rename from packages/server/test/e2e/7_run_ct_spec.js
rename to packages/server/test/e2e/run_ct_spec.js
diff --git a/packages/server/test/e2e/3_runnable_execution_spec.ts b/packages/server/test/e2e/runnable_execution_spec.ts
similarity index 100%
rename from packages/server/test/e2e/3_runnable_execution_spec.ts
rename to packages/server/test/e2e/runnable_execution_spec.ts
diff --git a/packages/server/test/e2e/4_screenshot_element_capture_spec.js b/packages/server/test/e2e/screenshot_element_capture_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_screenshot_element_capture_spec.js
rename to packages/server/test/e2e/screenshot_element_capture_spec.js
diff --git a/packages/server/test/e2e/4_screenshot_fullpage_capture_spec.js b/packages/server/test/e2e/screenshot_fullpage_capture_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_screenshot_fullpage_capture_spec.js
rename to packages/server/test/e2e/screenshot_fullpage_capture_spec.js
diff --git a/packages/server/test/e2e/4_screenshot_nested_file_spec.js b/packages/server/test/e2e/screenshot_nested_file_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_screenshot_nested_file_spec.js
rename to packages/server/test/e2e/screenshot_nested_file_spec.js
diff --git a/packages/server/test/e2e/5_screenshot_viewport_capture_spec.js b/packages/server/test/e2e/screenshot_viewport_capture_spec.js
similarity index 100%
rename from packages/server/test/e2e/5_screenshot_viewport_capture_spec.js
rename to packages/server/test/e2e/screenshot_viewport_capture_spec.js
diff --git a/packages/server/test/e2e/5_screenshots_spec.js b/packages/server/test/e2e/screenshots_spec.js
similarity index 100%
rename from packages/server/test/e2e/5_screenshots_spec.js
rename to packages/server/test/e2e/screenshots_spec.js
diff --git a/packages/server/test/e2e/5_server_sent_events_spec.js b/packages/server/test/e2e/server_sent_events_spec.js
similarity index 100%
rename from packages/server/test/e2e/5_server_sent_events_spec.js
rename to packages/server/test/e2e/server_sent_events_spec.js
diff --git a/packages/server/test/e2e/7_session_spec.ts b/packages/server/test/e2e/session_spec.ts
similarity index 100%
rename from packages/server/test/e2e/7_session_spec.ts
rename to packages/server/test/e2e/session_spec.ts
diff --git a/packages/server/test/e2e/5_spec_isolation_spec.js b/packages/server/test/e2e/spec_isolation_spec.js
similarity index 97%
rename from packages/server/test/e2e/5_spec_isolation_spec.js
rename to packages/server/test/e2e/spec_isolation_spec.js
index b971628f18..1adbf2ada0 100644
--- a/packages/server/test/e2e/5_spec_isolation_spec.js
+++ b/packages/server/test/e2e/spec_isolation_spec.js
@@ -1,4 +1,4 @@
-// TODO: rename this file to 5_module_api_spec
+// TODO: rename this file to module_api_spec
 
 const path = require('path')
 const _ = require('lodash')
diff --git a/packages/server/test/e2e/5_specs_spec.js b/packages/server/test/e2e/specs_spec.js
similarity index 100%
rename from packages/server/test/e2e/5_specs_spec.js
rename to packages/server/test/e2e/specs_spec.js
diff --git a/packages/server/test/e2e/5_stdout_spec.js b/packages/server/test/e2e/stdout_spec.js
similarity index 100%
rename from packages/server/test/e2e/5_stdout_spec.js
rename to packages/server/test/e2e/stdout_spec.js
diff --git a/packages/server/test/e2e/3_studio_spec.ts b/packages/server/test/e2e/studio_spec.ts
similarity index 100%
rename from packages/server/test/e2e/3_studio_spec.ts
rename to packages/server/test/e2e/studio_spec.ts
diff --git a/packages/server/test/e2e/5_subdomain_spec.ts b/packages/server/test/e2e/subdomain_spec.ts
similarity index 100%
rename from packages/server/test/e2e/5_subdomain_spec.ts
rename to packages/server/test/e2e/subdomain_spec.ts
diff --git a/packages/server/test/e2e/1_system_node_spec.js b/packages/server/test/e2e/system_node_spec.js
similarity index 100%
rename from packages/server/test/e2e/1_system_node_spec.js
rename to packages/server/test/e2e/system_node_spec.js
diff --git a/packages/server/test/e2e/5_task_not_registered_spec.js b/packages/server/test/e2e/task_not_registered_spec.js
similarity index 100%
rename from packages/server/test/e2e/5_task_not_registered_spec.js
rename to packages/server/test/e2e/task_not_registered_spec.js
diff --git a/packages/server/test/e2e/6_task_spec.js b/packages/server/test/e2e/task_spec.js
similarity index 100%
rename from packages/server/test/e2e/6_task_spec.js
rename to packages/server/test/e2e/task_spec.js
diff --git a/packages/server/test/e2e/3_testConfigOverrides_spec.ts b/packages/server/test/e2e/testConfigOverrides_spec.ts
similarity index 100%
rename from packages/server/test/e2e/3_testConfigOverrides_spec.ts
rename to packages/server/test/e2e/testConfigOverrides_spec.ts
diff --git a/packages/server/test/e2e/1_typescript_plugins_spec.ts b/packages/server/test/e2e/typescript_plugins_spec.ts
similarity index 100%
rename from packages/server/test/e2e/1_typescript_plugins_spec.ts
rename to packages/server/test/e2e/typescript_plugins_spec.ts
diff --git a/packages/server/test/e2e/1_typescript_spec_support_spec.ts b/packages/server/test/e2e/typescript_spec_support_spec.ts
similarity index 100%
rename from packages/server/test/e2e/1_typescript_spec_support_spec.ts
rename to packages/server/test/e2e/typescript_spec_support_spec.ts
diff --git a/packages/server/test/e2e/6_uncaught_spec_errors_spec.js b/packages/server/test/e2e/uncaught_spec_errors_spec.js
similarity index 100%
rename from packages/server/test/e2e/6_uncaught_spec_errors_spec.js
rename to packages/server/test/e2e/uncaught_spec_errors_spec.js
diff --git a/packages/server/test/e2e/6_uncaught_support_file_spec.js b/packages/server/test/e2e/uncaught_support_file_spec.js
similarity index 100%
rename from packages/server/test/e2e/6_uncaught_support_file_spec.js
rename to packages/server/test/e2e/uncaught_support_file_spec.js
diff --git a/packages/server/test/e2e/3_user_agent_spec.js b/packages/server/test/e2e/user_agent_spec.js
similarity index 100%
rename from packages/server/test/e2e/3_user_agent_spec.js
rename to packages/server/test/e2e/user_agent_spec.js
diff --git a/packages/server/test/e2e/6_video_compression_spec.js b/packages/server/test/e2e/video_compression_spec.js
similarity index 100%
rename from packages/server/test/e2e/6_video_compression_spec.js
rename to packages/server/test/e2e/video_compression_spec.js
diff --git a/packages/server/test/e2e/6_viewport_spec.js b/packages/server/test/e2e/viewport_spec.js
similarity index 100%
rename from packages/server/test/e2e/6_viewport_spec.js
rename to packages/server/test/e2e/viewport_spec.js
diff --git a/packages/server/test/e2e/6_visit_spec.js b/packages/server/test/e2e/visit_spec.js
similarity index 100%
rename from packages/server/test/e2e/6_visit_spec.js
rename to packages/server/test/e2e/visit_spec.js
diff --git a/packages/server/test/e2e/6_web_security_spec.js b/packages/server/test/e2e/web_security_spec.js
similarity index 100%
rename from packages/server/test/e2e/6_web_security_spec.js
rename to packages/server/test/e2e/web_security_spec.js
diff --git a/packages/server/test/e2e/4_websockets_spec.js b/packages/server/test/e2e/websockets_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_websockets_spec.js
rename to packages/server/test/e2e/websockets_spec.js
diff --git a/packages/server/test/e2e/4_window_open_spec.js b/packages/server/test/e2e/window_open_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_window_open_spec.js
rename to packages/server/test/e2e/window_open_spec.js
diff --git a/packages/server/test/e2e/4_xhr_spec.js b/packages/server/test/e2e/xhr_spec.js
similarity index 100%
rename from packages/server/test/e2e/4_xhr_spec.js
rename to packages/server/test/e2e/xhr_spec.js
diff --git a/packages/server/test/e2e/4_yarn_v2_pnp_spec.ts b/packages/server/test/e2e/yarn_v2_pnp_spec.ts
similarity index 100%
rename from packages/server/test/e2e/4_yarn_v2_pnp_spec.ts
rename to packages/server/test/e2e/yarn_v2_pnp_spec.ts