diff --git a/pkg/analysis_server/CONTRIBUTING.md b/pkg/analysis_server/CONTRIBUTING.md
index 610e06ec9af..0a575b89bf5 100644
--- a/pkg/analysis_server/CONTRIBUTING.md
+++ b/pkg/analysis_server/CONTRIBUTING.md
@@ -61,7 +61,7 @@ To run all analysis server tests:
 To run just the analysis server integration tests:
 
 ```
-./tools/test.py -mrelease pkg/analysis_server/test/integration/
+./tools/test.py -mrelease pkg/analysis_server/integration_test/
 ```
 
 To run a single test:
diff --git a/pkg/analysis_server/benchmark/integration/driver.dart b/pkg/analysis_server/benchmark/integration/driver.dart
index f551d70310a..2bafa7ab82c 100644
--- a/pkg/analysis_server/benchmark/integration/driver.dart
+++ b/pkg/analysis_server/benchmark/integration/driver.dart
@@ -9,8 +9,8 @@ import 'dart:math' show max, sqrt;
 import 'package:logging/logging.dart';
 import 'package:path/path.dart';
 
-import '../../test/integration/support/integration_test_methods.dart';
-import '../../test/integration/support/integration_tests.dart';
+import '../../integration_test/support/integration_test_methods.dart';
+import '../../integration_test/support/integration_tests.dart';
 import 'operation.dart';
 
 /// [Driver] launches and manages an instance of analysis server,
diff --git a/pkg/analysis_server/benchmark/perf/memory_tests.dart b/pkg/analysis_server/benchmark/perf/memory_tests.dart
index 007d0d45631..ad0fa1d9024 100644
--- a/pkg/analysis_server/benchmark/perf/memory_tests.dart
+++ b/pkg/analysis_server/benchmark/perf/memory_tests.dart
@@ -12,8 +12,8 @@ import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:test/test.dart';
 
-import '../../test/integration/lsp_server/integration_tests.dart';
-import '../../test/integration/support/integration_tests.dart';
+import '../../integration_test/lsp_server/integration_tests.dart';
+import '../../integration_test/support/integration_tests.dart';
 import '../../test/lsp/server_abstract.dart' show ClientCapabilitiesHelperMixin;
 
 /// A server protocol-agnostic interface to the memory test, allowing the same
diff --git a/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart b/pkg/analysis_server/integration_test/analysis/analysis_options_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
rename to pkg/analysis_server/integration_test/analysis/analysis_options_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/error_test.dart b/pkg/analysis_server/integration_test/analysis/error_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/error_test.dart
rename to pkg/analysis_server/integration_test/analysis/error_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart b/pkg/analysis_server/integration_test/analysis/get_errors_non_standard_sdk_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart
rename to pkg/analysis_server/integration_test/analysis/get_errors_non_standard_sdk_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/get_errors_test.dart b/pkg/analysis_server/integration_test/analysis/get_errors_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/get_errors_test.dart
rename to pkg/analysis_server/integration_test/analysis/get_errors_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/get_hover_test.dart b/pkg/analysis_server/integration_test/analysis/get_hover_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/get_hover_test.dart
rename to pkg/analysis_server/integration_test/analysis/get_hover_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart b/pkg/analysis_server/integration_test/analysis/get_imported_elements_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart
rename to pkg/analysis_server/integration_test/analysis/get_imported_elements_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart b/pkg/analysis_server/integration_test/analysis/get_library_dependencies_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart
rename to pkg/analysis_server/integration_test/analysis/get_library_dependencies_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/get_navigation_test.dart b/pkg/analysis_server/integration_test/analysis/get_navigation_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/get_navigation_test.dart
rename to pkg/analysis_server/integration_test/analysis/get_navigation_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart b/pkg/analysis_server/integration_test/analysis/get_reachable_sources_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart
rename to pkg/analysis_server/integration_test/analysis/get_reachable_sources_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/highlights_test.dart b/pkg/analysis_server/integration_test/analysis/highlights_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/highlights_test.dart
rename to pkg/analysis_server/integration_test/analysis/highlights_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/lint_test.dart b/pkg/analysis_server/integration_test/analysis/lint_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/lint_test.dart
rename to pkg/analysis_server/integration_test/analysis/lint_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/navigation_test.dart b/pkg/analysis_server/integration_test/analysis/navigation_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/navigation_test.dart
rename to pkg/analysis_server/integration_test/analysis/navigation_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/occurrences_test.dart b/pkg/analysis_server/integration_test/analysis/occurrences_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/occurrences_test.dart
rename to pkg/analysis_server/integration_test/analysis/occurrences_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/outline_test.dart b/pkg/analysis_server/integration_test/analysis/outline_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/outline_test.dart
rename to pkg/analysis_server/integration_test/analysis/outline_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/overrides_test.dart b/pkg/analysis_server/integration_test/analysis/overrides_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/overrides_test.dart
rename to pkg/analysis_server/integration_test/analysis/overrides_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/package_root_test.dart b/pkg/analysis_server/integration_test/analysis/package_root_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/package_root_test.dart
rename to pkg/analysis_server/integration_test/analysis/package_root_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart b/pkg/analysis_server/integration_test/analysis/reanalyze_concurrent_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart
rename to pkg/analysis_server/integration_test/analysis/reanalyze_concurrent_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/reanalyze_test.dart b/pkg/analysis_server/integration_test/analysis/reanalyze_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/reanalyze_test.dart
rename to pkg/analysis_server/integration_test/analysis/reanalyze_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart b/pkg/analysis_server/integration_test/analysis/set_analysis_roots_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart
rename to pkg/analysis_server/integration_test/analysis/set_analysis_roots_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart b/pkg/analysis_server/integration_test/analysis/set_general_subscriptions_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart
rename to pkg/analysis_server/integration_test/analysis/set_general_subscriptions_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart b/pkg/analysis_server/integration_test/analysis/set_priority_files_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart
rename to pkg/analysis_server/integration_test/analysis/set_priority_files_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart b/pkg/analysis_server/integration_test/analysis/set_subscriptions_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart
rename to pkg/analysis_server/integration_test/analysis/set_subscriptions_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/test_all.dart b/pkg/analysis_server/integration_test/analysis/test_all.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/test_all.dart
rename to pkg/analysis_server/integration_test/analysis/test_all.dart
diff --git a/pkg/analysis_server/test/integration/analysis/update_content_list_test.dart b/pkg/analysis_server/integration_test/analysis/update_content_list_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/update_content_list_test.dart
rename to pkg/analysis_server/integration_test/analysis/update_content_list_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/update_content_test.dart b/pkg/analysis_server/integration_test/analysis/update_content_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/update_content_test.dart
rename to pkg/analysis_server/integration_test/analysis/update_content_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/update_options_test.dart b/pkg/analysis_server/integration_test/analysis/update_options_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/analysis/update_options_test.dart
rename to pkg/analysis_server/integration_test/analysis/update_options_test.dart
diff --git a/pkg/analysis_server/integration_test/analysis_options.yaml b/pkg/analysis_server/integration_test/analysis_options.yaml
new file mode 100644
index 00000000000..fcb20c42136
--- /dev/null
+++ b/pkg/analysis_server/integration_test/analysis_options.yaml
@@ -0,0 +1,2 @@
+# Use the same analysis options as the main test folder.
+include: ../test/analysis_options.yaml
diff --git a/pkg/analysis_server/test/integration/completion/get_suggestions_test.dart b/pkg/analysis_server/integration_test/completion/get_suggestions_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/completion/get_suggestions_test.dart
rename to pkg/analysis_server/integration_test/completion/get_suggestions_test.dart
diff --git a/pkg/analysis_server/test/integration/completion/test_all.dart b/pkg/analysis_server/integration_test/completion/test_all.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/completion/test_all.dart
rename to pkg/analysis_server/integration_test/completion/test_all.dart
diff --git a/pkg/analysis_server/test/integration/coverage.md b/pkg/analysis_server/integration_test/coverage.md
similarity index 100%
rename from pkg/analysis_server/test/integration/coverage.md
rename to pkg/analysis_server/integration_test/coverage.md
diff --git a/pkg/analysis_server/test/integration/coverage_test.dart b/pkg/analysis_server/integration_test/coverage_test.dart
similarity index 91%
rename from pkg/analysis_server/test/integration/coverage_test.dart
rename to pkg/analysis_server/integration_test/coverage_test.dart
index 6c801f784bf..a0be24c96ce 100644
--- a/pkg/analysis_server/test/integration/coverage_test.dart
+++ b/pkg/analysis_server/integration_test/coverage_test.dart
@@ -8,8 +8,8 @@ import 'package:analyzer_plugin/src/utilities/string_utilities.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
-import '../../tool/spec/api.dart';
-import '../../tool/spec/from_html.dart';
+import '../tool/spec/api.dart';
+import '../tool/spec/from_html.dart';
 
 /// Define tests to fail if there's no mention in the coverage file.
 void main() {
@@ -28,9 +28,7 @@ void main() {
     pathPrefix = path.join('pkg', 'analysis_server');
   }
 
-  coverageFile = File(
-    path.join(pathPrefix, 'test', 'integration', 'coverage.md'),
-  );
+  coverageFile = File(path.join(pathPrefix, 'integration_test', 'coverage.md'));
   var lines = coverageFile.readAsLinesSync();
 
   // ## server domain
@@ -87,12 +85,7 @@ void main() {
               request.method,
             ).map((s) => s.toLowerCase()).join('_');
             var testName = path.join(domain.name, '${fileName}_test.dart');
-            var testPath = path.join(
-              pathPrefix,
-              'test',
-              'integration',
-              testName,
-            );
+            var testPath = path.join(pathPrefix, 'integration_test', testName);
 
             // Test that if checked, a test file exists; if not checked, no such
             // file exists.
diff --git a/pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart b/pkg/analysis_server/integration_test/diagnostic/get_diagnostics_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart
rename to pkg/analysis_server/integration_test/diagnostic/get_diagnostics_test.dart
diff --git a/pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart b/pkg/analysis_server/integration_test/diagnostic/get_server_port_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart
rename to pkg/analysis_server/integration_test/diagnostic/get_server_port_test.dart
diff --git a/pkg/analysis_server/test/integration/diagnostic/test_all.dart b/pkg/analysis_server/integration_test/diagnostic/test_all.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/diagnostic/test_all.dart
rename to pkg/analysis_server/integration_test/diagnostic/test_all.dart
diff --git a/pkg/analysis_server/test/integration/dtd/dtd_test.dart b/pkg/analysis_server/integration_test/dtd/dtd_test.dart
similarity index 96%
rename from pkg/analysis_server/test/integration/dtd/dtd_test.dart
rename to pkg/analysis_server/integration_test/dtd/dtd_test.dart
index cbf4ebf1f86..caaad3f9f81 100644
--- a/pkg/analysis_server/test/integration/dtd/dtd_test.dart
+++ b/pkg/analysis_server/integration_test/dtd/dtd_test.dart
@@ -4,7 +4,7 @@
 
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import '../../shared/shared_dtd_tests.dart';
+import '../../test/shared/shared_dtd_tests.dart';
 import '../lsp/abstract_lsp_over_legacy.dart';
 
 void main() {
diff --git a/pkg/analysis_server/test/integration/dtd/test_all.dart b/pkg/analysis_server/integration_test/dtd/test_all.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/dtd/test_all.dart
rename to pkg/analysis_server/integration_test/dtd/test_all.dart
diff --git a/pkg/analysis_server/test/integration/edit/bulk_fixes_test.dart b/pkg/analysis_server/integration_test/edit/bulk_fixes_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/bulk_fixes_test.dart
rename to pkg/analysis_server/integration_test/edit/bulk_fixes_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/format_test.dart b/pkg/analysis_server/integration_test/edit/format_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/format_test.dart
rename to pkg/analysis_server/integration_test/edit/format_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/get_assists_test.dart b/pkg/analysis_server/integration_test/edit/get_assists_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/get_assists_test.dart
rename to pkg/analysis_server/integration_test/edit/get_assists_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart b/pkg/analysis_server/integration_test/edit/get_available_refactorings_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart
rename to pkg/analysis_server/integration_test/edit/get_available_refactorings_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/get_fixes_test.dart b/pkg/analysis_server/integration_test/edit/get_fixes_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/get_fixes_test.dart
rename to pkg/analysis_server/integration_test/edit/get_fixes_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart b/pkg/analysis_server/integration_test/edit/get_postfix_completion_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart
rename to pkg/analysis_server/integration_test/edit/get_postfix_completion_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/get_refactoring_test.dart b/pkg/analysis_server/integration_test/edit/get_refactoring_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/get_refactoring_test.dart
rename to pkg/analysis_server/integration_test/edit/get_refactoring_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart b/pkg/analysis_server/integration_test/edit/get_statement_completion_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart
rename to pkg/analysis_server/integration_test/edit/get_statement_completion_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/import_elements_test.dart b/pkg/analysis_server/integration_test/edit/import_elements_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/import_elements_test.dart
rename to pkg/analysis_server/integration_test/edit/import_elements_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart b/pkg/analysis_server/integration_test/edit/is_postfix_completion_applicable_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart
rename to pkg/analysis_server/integration_test/edit/is_postfix_completion_applicable_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart b/pkg/analysis_server/integration_test/edit/list_postfix_completion_templates_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart
rename to pkg/analysis_server/integration_test/edit/list_postfix_completion_templates_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/organize_directives_test.dart b/pkg/analysis_server/integration_test/edit/organize_directives_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/organize_directives_test.dart
rename to pkg/analysis_server/integration_test/edit/organize_directives_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/sort_members_test.dart b/pkg/analysis_server/integration_test/edit/sort_members_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/sort_members_test.dart
rename to pkg/analysis_server/integration_test/edit/sort_members_test.dart
diff --git a/pkg/analysis_server/test/integration/edit/test_all.dart b/pkg/analysis_server/integration_test/edit/test_all.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/edit/test_all.dart
rename to pkg/analysis_server/integration_test/edit/test_all.dart
diff --git a/pkg/analysis_server/test/integration/execution/create_context_test.dart b/pkg/analysis_server/integration_test/execution/create_context_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/execution/create_context_test.dart
rename to pkg/analysis_server/integration_test/execution/create_context_test.dart
diff --git a/pkg/analysis_server/test/integration/execution/delete_context_test.dart b/pkg/analysis_server/integration_test/execution/delete_context_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/execution/delete_context_test.dart
rename to pkg/analysis_server/integration_test/execution/delete_context_test.dart
diff --git a/pkg/analysis_server/test/integration/execution/map_uri_test.dart b/pkg/analysis_server/integration_test/execution/map_uri_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/execution/map_uri_test.dart
rename to pkg/analysis_server/integration_test/execution/map_uri_test.dart
diff --git a/pkg/analysis_server/test/integration/execution/set_subscriptions_test.dart b/pkg/analysis_server/integration_test/execution/set_subscriptions_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/execution/set_subscriptions_test.dart
rename to pkg/analysis_server/integration_test/execution/set_subscriptions_test.dart
diff --git a/pkg/analysis_server/test/integration/execution/test_all.dart b/pkg/analysis_server/integration_test/execution/test_all.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/execution/test_all.dart
rename to pkg/analysis_server/integration_test/execution/test_all.dart
diff --git a/pkg/analysis_server/test/integration/lsp/abstract_lsp_over_legacy.dart b/pkg/analysis_server/integration_test/lsp/abstract_lsp_over_legacy.dart
similarity index 98%
rename from pkg/analysis_server/test/integration/lsp/abstract_lsp_over_legacy.dart
rename to pkg/analysis_server/integration_test/lsp/abstract_lsp_over_legacy.dart
index eeb87ee2e80..b704f2764cb 100644
--- a/pkg/analysis_server/test/integration/lsp/abstract_lsp_over_legacy.dart
+++ b/pkg/analysis_server/integration_test/lsp/abstract_lsp_over_legacy.dart
@@ -12,8 +12,8 @@ import 'package:analyzer_plugin/src/utilities/client_uri_converter.dart';
 import 'package:path/path.dart';
 import 'package:test/test.dart';
 
-import '../../lsp/request_helpers_mixin.dart';
-import '../../lsp/server_abstract.dart';
+import '../../test/lsp/request_helpers_mixin.dart';
+import '../../test/lsp/server_abstract.dart';
 import '../support/integration_tests.dart';
 
 abstract class AbstractLspOverLegacyTest
diff --git a/pkg/analysis_server/test/integration/lsp/handle_test.dart b/pkg/analysis_server/integration_test/lsp/handle_test.dart
similarity index 97%
rename from pkg/analysis_server/test/integration/lsp/handle_test.dart
rename to pkg/analysis_server/integration_test/lsp/handle_test.dart
index ec404ed48dd..e691b0e9d18 100644
--- a/pkg/analysis_server/test/integration/lsp/handle_test.dart
+++ b/pkg/analysis_server/integration_test/lsp/handle_test.dart
@@ -10,8 +10,8 @@ import 'package:analyzer/src/test_utilities/test_code_format.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import '../../tool/lsp_spec/matchers.dart';
-import '../../utils/test_code_extensions.dart';
+import '../../test/tool/lsp_spec/matchers.dart';
+import '../../test/utils/test_code_extensions.dart';
 import '../support/integration_tests.dart';
 import 'abstract_lsp_over_legacy.dart';
 
diff --git a/pkg/analysis_server/test/integration/lsp/readme.md b/pkg/analysis_server/integration_test/lsp/readme.md
similarity index 100%
rename from pkg/analysis_server/test/integration/lsp/readme.md
rename to pkg/analysis_server/integration_test/lsp/readme.md
diff --git a/pkg/analysis_server/test/integration/lsp/test_all.dart b/pkg/analysis_server/integration_test/lsp/test_all.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/lsp/test_all.dart
rename to pkg/analysis_server/integration_test/lsp/test_all.dart
diff --git a/pkg/analysis_server/test/integration/lsp_server/analyzer_status_test.dart b/pkg/analysis_server/integration_test/lsp_server/analyzer_status_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/lsp_server/analyzer_status_test.dart
rename to pkg/analysis_server/integration_test/lsp_server/analyzer_status_test.dart
diff --git a/pkg/analysis_server/test/integration/lsp_server/diagnostic_test.dart b/pkg/analysis_server/integration_test/lsp_server/diagnostic_test.dart
similarity index 98%
rename from pkg/analysis_server/test/integration/lsp_server/diagnostic_test.dart
rename to pkg/analysis_server/integration_test/lsp_server/diagnostic_test.dart
index 8e40f3a91df..0635fcef1cc 100644
--- a/pkg/analysis_server/test/integration/lsp_server/diagnostic_test.dart
+++ b/pkg/analysis_server/integration_test/lsp_server/diagnostic_test.dart
@@ -6,7 +6,7 @@ import 'package:analyzer/src/test_utilities/test_code_format.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import '../../utils/test_code_extensions.dart';
+import '../../test/utils/test_code_extensions.dart';
 import 'integration_tests.dart';
 
 void main() {
diff --git a/pkg/analysis_server/test/integration/lsp_server/dtd_test.dart b/pkg/analysis_server/integration_test/lsp_server/dtd_test.dart
similarity index 97%
rename from pkg/analysis_server/test/integration/lsp_server/dtd_test.dart
rename to pkg/analysis_server/integration_test/lsp_server/dtd_test.dart
index 14269877449..58c8a0d759d 100644
--- a/pkg/analysis_server/test/integration/lsp_server/dtd_test.dart
+++ b/pkg/analysis_server/integration_test/lsp_server/dtd_test.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import '../../shared/shared_dtd_tests.dart';
+import '../../test/shared/shared_dtd_tests.dart';
 import 'integration_tests.dart';
 
 void main() {
diff --git a/pkg/analysis_server/test/integration/lsp_server/initialization_test.dart b/pkg/analysis_server/integration_test/lsp_server/initialization_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/lsp_server/initialization_test.dart
rename to pkg/analysis_server/integration_test/lsp_server/initialization_test.dart
diff --git a/pkg/analysis_server/test/integration/lsp_server/integration_tests.dart b/pkg/analysis_server/integration_test/lsp_server/integration_tests.dart
similarity index 98%
rename from pkg/analysis_server/test/integration/lsp_server/integration_tests.dart
rename to pkg/analysis_server/integration_test/lsp_server/integration_tests.dart
index dbc6ec423fe..9f57f77354c 100644
--- a/pkg/analysis_server/test/integration/lsp_server/integration_tests.dart
+++ b/pkg/analysis_server/integration_test/lsp_server/integration_tests.dart
@@ -15,10 +15,10 @@ import 'package:analyzer_plugin/src/utilities/client_uri_converter.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
 
-import '../../constants.dart';
-import '../../lsp/request_helpers_mixin.dart';
-import '../../lsp/server_abstract.dart';
-import '../../support/sdk_paths.dart';
+import '../../test/constants.dart';
+import '../../test/lsp/request_helpers_mixin.dart';
+import '../../test/lsp/server_abstract.dart';
+import '../../test/support/sdk_paths.dart';
 
 abstract class AbstractLspAnalysisServerIntegrationTest
     with
diff --git a/pkg/analysis_server/test/integration/lsp_server/server_test.dart b/pkg/analysis_server/integration_test/lsp_server/server_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/lsp_server/server_test.dart
rename to pkg/analysis_server/integration_test/lsp_server/server_test.dart
diff --git a/pkg/analysis_server/test/integration/lsp_server/test_all.dart b/pkg/analysis_server/integration_test/lsp_server/test_all.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/lsp_server/test_all.dart
rename to pkg/analysis_server/integration_test/lsp_server/test_all.dart
diff --git a/pkg/analysis_server/test/integration/search/find_element_references_test.dart b/pkg/analysis_server/integration_test/search/find_element_references_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/search/find_element_references_test.dart
rename to pkg/analysis_server/integration_test/search/find_element_references_test.dart
diff --git a/pkg/analysis_server/test/integration/search/find_member_declarations_test.dart b/pkg/analysis_server/integration_test/search/find_member_declarations_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/search/find_member_declarations_test.dart
rename to pkg/analysis_server/integration_test/search/find_member_declarations_test.dart
diff --git a/pkg/analysis_server/test/integration/search/find_member_references_test.dart b/pkg/analysis_server/integration_test/search/find_member_references_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/search/find_member_references_test.dart
rename to pkg/analysis_server/integration_test/search/find_member_references_test.dart
diff --git a/pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart b/pkg/analysis_server/integration_test/search/find_top_level_declarations_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart
rename to pkg/analysis_server/integration_test/search/find_top_level_declarations_test.dart
diff --git a/pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart b/pkg/analysis_server/integration_test/search/get_type_hierarchy_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart
rename to pkg/analysis_server/integration_test/search/get_type_hierarchy_test.dart
diff --git a/pkg/analysis_server/test/integration/search/test_all.dart b/pkg/analysis_server/integration_test/search/test_all.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/search/test_all.dart
rename to pkg/analysis_server/integration_test/search/test_all.dart
diff --git a/pkg/analysis_server/test/integration/server/blaze_changes_test.dart b/pkg/analysis_server/integration_test/server/blaze_changes_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/server/blaze_changes_test.dart
rename to pkg/analysis_server/integration_test/server/blaze_changes_test.dart
diff --git a/pkg/analysis_server/test/integration/server/command_line_options_test.dart b/pkg/analysis_server/integration_test/server/command_line_options_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/server/command_line_options_test.dart
rename to pkg/analysis_server/integration_test/server/command_line_options_test.dart
diff --git a/pkg/analysis_server/test/integration/server/get_version_test.dart b/pkg/analysis_server/integration_test/server/get_version_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/server/get_version_test.dart
rename to pkg/analysis_server/integration_test/server/get_version_test.dart
diff --git a/pkg/analysis_server/test/integration/server/message_scheduler_test.dart b/pkg/analysis_server/integration_test/server/message_scheduler_test.dart
similarity index 98%
rename from pkg/analysis_server/test/integration/server/message_scheduler_test.dart
rename to pkg/analysis_server/integration_test/server/message_scheduler_test.dart
index b30c4f8408e..038dbddcae6 100644
--- a/pkg/analysis_server/test/integration/server/message_scheduler_test.dart
+++ b/pkg/analysis_server/integration_test/server/message_scheduler_test.dart
@@ -14,10 +14,10 @@ import 'package:language_server_protocol/protocol_generated.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import '../../analysis_server_base.dart';
-import '../../lsp/code_actions_refactor_test.dart';
-import '../../utils/message_scheduler_test_view.dart';
-import '../../utils/test_code_extensions.dart';
+import '../../test/analysis_server_base.dart';
+import '../../test/lsp/code_actions_refactor_test.dart';
+import '../../test/utils/message_scheduler_test_view.dart';
+import '../../test/utils/test_code_extensions.dart';
 
 void main() {
   defineReflectiveSuite(() {
diff --git a/pkg/analysis_server/test/integration/server/set_subscriptions_invalid_service_test.dart b/pkg/analysis_server/integration_test/server/set_subscriptions_invalid_service_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/server/set_subscriptions_invalid_service_test.dart
rename to pkg/analysis_server/integration_test/server/set_subscriptions_invalid_service_test.dart
diff --git a/pkg/analysis_server/test/integration/server/set_subscriptions_test.dart b/pkg/analysis_server/integration_test/server/set_subscriptions_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/server/set_subscriptions_test.dart
rename to pkg/analysis_server/integration_test/server/set_subscriptions_test.dart
diff --git a/pkg/analysis_server/test/integration/server/shutdown_test.dart b/pkg/analysis_server/integration_test/server/shutdown_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/server/shutdown_test.dart
rename to pkg/analysis_server/integration_test/server/shutdown_test.dart
diff --git a/pkg/analysis_server/test/integration/server/status_test.dart b/pkg/analysis_server/integration_test/server/status_test.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/server/status_test.dart
rename to pkg/analysis_server/integration_test/server/status_test.dart
diff --git a/pkg/analysis_server/test/integration/server/test_all.dart b/pkg/analysis_server/integration_test/server/test_all.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/server/test_all.dart
rename to pkg/analysis_server/integration_test/server/test_all.dart
diff --git a/pkg/analysis_server/test/integration/support/dart_tooling_daemon.dart b/pkg/analysis_server/integration_test/support/dart_tooling_daemon.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/support/dart_tooling_daemon.dart
rename to pkg/analysis_server/integration_test/support/dart_tooling_daemon.dart
diff --git a/pkg/analysis_server/test/integration/support/integration_test_methods.dart b/pkg/analysis_server/integration_test/support/integration_test_methods.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/support/integration_test_methods.dart
rename to pkg/analysis_server/integration_test/support/integration_test_methods.dart
diff --git a/pkg/analysis_server/test/integration/support/integration_tests.dart b/pkg/analysis_server/integration_test/support/integration_tests.dart
similarity index 99%
rename from pkg/analysis_server/test/integration/support/integration_tests.dart
rename to pkg/analysis_server/integration_test/support/integration_tests.dart
index 14b99f710fc..1737dfba6eb 100644
--- a/pkg/analysis_server/test/integration/support/integration_tests.dart
+++ b/pkg/analysis_server/integration_test/support/integration_tests.dart
@@ -18,9 +18,9 @@ import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
-import '../../constants.dart';
-import '../../support/configuration_files.dart';
-import '../../support/sdk_paths.dart';
+import '../../test/constants.dart';
+import '../../test/support/configuration_files.dart';
+import '../../test/support/sdk_paths.dart';
 import 'integration_test_methods.dart';
 import 'protocol_matchers.dart';
 
diff --git a/pkg/analysis_server/test/integration/support/protocol_matchers.dart b/pkg/analysis_server/integration_test/support/protocol_matchers.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/support/protocol_matchers.dart
rename to pkg/analysis_server/integration_test/support/protocol_matchers.dart
diff --git a/pkg/analysis_server/test/integration/support/web_sockets.dart b/pkg/analysis_server/integration_test/support/web_sockets.dart
similarity index 97%
rename from pkg/analysis_server/test/integration/support/web_sockets.dart
rename to pkg/analysis_server/integration_test/support/web_sockets.dart
index f1a09b5c8d9..e580b541c2a 100644
--- a/pkg/analysis_server/test/integration/support/web_sockets.dart
+++ b/pkg/analysis_server/integration_test/support/web_sockets.dart
@@ -7,7 +7,7 @@ import 'dart:async';
 import 'package:stream_channel/stream_channel.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
-import '../../constants.dart';
+import '../../test/constants.dart';
 
 /// Creates a [StreamChannel] for a connection to a WebSocket at [wsUri] that
 /// prints all communication if [debugPrintCommunication] is `true`.
diff --git a/pkg/analysis_server/test/integration/test_all.dart b/pkg/analysis_server/integration_test/test_all.dart
similarity index 100%
rename from pkg/analysis_server/test/integration/test_all.dart
rename to pkg/analysis_server/integration_test/test_all.dart
diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
index b3136a40414..e2f887eaed3 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -47,7 +47,7 @@ import 'package:yaml/yaml.dart';
 // it and re-enable it everywhere.
 // Not private to enable testing.
 // NB: If you set this to `false` remember to disable the
-// `test/integration/serve/blaze_changes_test.dart`.
+// `integration_test/serve/blaze_changes_test.dart`.
 var experimentalEnableBlazeWatching = true;
 
 /// Class that maintains a mapping from included/excluded paths to a set of
diff --git a/pkg/analysis_server/test/analysis/get_navigation_test.dart b/pkg/analysis_server/test/analysis/get_navigation_test.dart
index 239da384b2d..a349132d8c7 100644
--- a/pkg/analysis_server/test/analysis/get_navigation_test.dart
+++ b/pkg/analysis_server/test/analysis/get_navigation_test.dart
@@ -263,7 +263,7 @@ f() {
 
   Future<void> test_fieldType() async {
     // This test mirrors test_navigation() from
-    // test/integration/analysis/get_navigation_test.dart
+    // integration_test/analysis/get_navigation_test.dart
     var text = r'''
 class Foo {}
 
diff --git a/pkg/analysis_server/test/shared/shared_dtd_tests.dart b/pkg/analysis_server/test/shared/shared_dtd_tests.dart
index 2187ec4ba64..0001d3d0738 100644
--- a/pkg/analysis_server/test/shared/shared_dtd_tests.dart
+++ b/pkg/analysis_server/test/shared/shared_dtd_tests.dart
@@ -11,8 +11,8 @@ import 'package:dtd/dtd.dart';
 import 'package:json_rpc_2/json_rpc_2.dart';
 import 'package:test/test.dart';
 
-import '../integration/support/dart_tooling_daemon.dart';
-import '../integration/support/web_sockets.dart';
+import '../../integration_test/support/dart_tooling_daemon.dart';
+import '../../integration_test/support/web_sockets.dart';
 import '../lsp/request_helpers_mixin.dart';
 import '../tool/lsp_spec/matchers.dart';
 import '../utils/lsp_protocol_extensions.dart';
diff --git a/pkg/analysis_server/test/timing/timing_framework.dart b/pkg/analysis_server/test/timing/timing_framework.dart
index 56c7e175651..652749de8ac 100644
--- a/pkg/analysis_server/test/timing/timing_framework.dart
+++ b/pkg/analysis_server/test/timing/timing_framework.dart
@@ -8,8 +8,8 @@ import 'dart:math';
 
 import 'package:path/path.dart';
 
-import '../integration/support/integration_test_methods.dart';
-import '../integration/support/integration_tests.dart';
+import '../../integration_test/support/integration_test_methods.dart';
+import '../../integration_test/support/integration_tests.dart';
 
 /// Instances of the class [TimingResult] represent the timing information
 /// gathered while executing a given timing test.
diff --git a/pkg/analysis_server/test/verify_sorted_test.dart b/pkg/analysis_server/test/verify_sorted_test.dart
index fd7240171a2..5c0670916a0 100644
--- a/pkg/analysis_server/test/verify_sorted_test.dart
+++ b/pkg/analysis_server/test/verify_sorted_test.dart
@@ -80,8 +80,8 @@ void buildTestsForAnalysisServer() {
     //  remove these exclusions.
     'lib/protocol/protocol_constants.dart',
     'lib/protocol/protocol_generated.dart',
-    'test/integration/support/integration_test_methods.dart',
-    'test/integration/support/protocol_matchers.dart',
+    'integration_test/support/integration_test_methods.dart',
+    'integration_test/support/protocol_matchers.dart',
     // The following are not generated, but can't be sorted because they contain
     // ignore comments in the directives, which sorting deletes.
     'lib/src/services/kythe/schema.dart',
diff --git a/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart b/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart
index 6c45d4239fe..473388cbd97 100644
--- a/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart
+++ b/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart
@@ -14,7 +14,7 @@ import 'from_html.dart';
 import 'to_html.dart';
 
 final GeneratedFile target = GeneratedFile(
-  'test/integration/support/integration_test_methods.dart',
+  'integration_test/support/integration_test_methods.dart',
   (String pkgPath) async {
     var visitor = CodegenInttestMethodsVisitor(
       path.basename(pkgPath),
diff --git a/pkg/analysis_server/tool/spec/codegen_matchers.dart b/pkg/analysis_server/tool/spec/codegen_matchers.dart
index e11d5f1a74f..3602a2525ba 100644
--- a/pkg/analysis_server/tool/spec/codegen_matchers.dart
+++ b/pkg/analysis_server/tool/spec/codegen_matchers.dart
@@ -13,7 +13,7 @@ import 'implied_types.dart';
 import 'to_html.dart';
 
 final GeneratedFile target = GeneratedFile(
-  'test/integration/support/protocol_matchers.dart',
+  'integration_test/support/protocol_matchers.dart',
   (String pkgPath) async {
     var visitor = CodegenMatchersVisitor(readApi(pkgPath));
     return visitor.collectCode(visitor.visitApi);
diff --git a/pkg/analysis_server/tool/spec/generate_files b/pkg/analysis_server/tool/spec/generate_files
index 5f3186f17bc..c1b03ec56fe 100755
--- a/pkg/analysis_server/tool/spec/generate_files
+++ b/pkg/analysis_server/tool/spec/generate_files
@@ -8,10 +8,10 @@
 #
 # - ../../doc/api.html: The human-readable API spec.
 #
-# - ../../test/integration/protocol_matchers.dart: matchers to be used by
+# - ../../integration_test/protocol_matchers.dart: matchers to be used by
 #   integration tests.
 #
-# - ../../test/integration/integration_test_methods.dart: convenience methods
+# - ../../integration_test/integration_test_methods.dart: convenience methods
 #   to be used by integration tests.
 
 set -e