diff --git a/.gitattributes b/.gitattributes
index 207c1a293c8..6ac541da4a3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,11 +13,11 @@
 *.md text
 *.yaml text
 
-# Files that should not be converted.
-tests/compiler/dart2js_extra/eof_line_ending_test.dart -text
-tests/compiler/dart2js_extra/string_interpolation_test.dart -text
-tests/compiler/dart2js_extra/string_interpolation_dynamic_test.dart -text
-tests/compiler/dart2js_extra/literal_string_juxtaposition_test.dart -text
+# File that should not be converted.
+tests/dart2js_2/eof_line_ending_test.dart -text
+tests/dart2js_2/string_interpolation_test.dart -text
+tests/dart2js_2/string_interpolation_dynamic_test.dart -text
+tests/dart2js_2/literal_string_juxtaposition_test.dart -text
 tests/language_2/string/raw_string_test.dart -text
 tests/language_2/string/multiline_strings_test.dart -text
 tests/language_2/string/multiline_newline_cr.dart -text
diff --git a/pkg/compiler/lib/src/js_model/element_map_impl.dart b/pkg/compiler/lib/src/js_model/element_map_impl.dart
index c990f17e739..7c7d0053534 100644
--- a/pkg/compiler/lib/src/js_model/element_map_impl.dart
+++ b/pkg/compiler/lib/src/js_model/element_map_impl.dart
@@ -1332,7 +1332,8 @@ class JsKernelToElementMap implements JsToElementMap, IrToElementMap {
       var mainUri = elementEnvironment.mainLibrary.canonicalUri;
       // Tests permit lookup outside of dart: libraries.
       return mainUri.path.contains('tests/compiler/dart2js_native') ||
-          mainUri.path.contains('tests/compiler/dart2js_extra');
+          mainUri.path.contains(RegExp(r'(?<!generated_)tests/dart2js_2/internal')) ||
+          mainUri.path.contains(RegExp(r'(?<!generated_)tests/dart2js_2/native'));
     }
 
     DartType lookup(String typeName, {bool required}) {
diff --git a/pkg/compiler/lib/src/kernel/dart2js_target.dart b/pkg/compiler/lib/src/kernel/dart2js_target.dart
index ff92060674f..531eb4fb3c4 100644
--- a/pkg/compiler/lib/src/kernel/dart2js_target.dart
+++ b/pkg/compiler/lib/src/kernel/dart2js_target.dart
@@ -36,7 +36,8 @@ bool maybeEnableNative(Uri uri) {
   bool allowedTestLibrary() {
     String scriptName = uri.path;
     return scriptName.contains('tests/compiler/dart2js_native') ||
-        scriptName.contains('tests/compiler/dart2js_extra') ||
+        scriptName.contains(RegExp(r'(?<!generated_)tests/dart2js_2/native')) ||
+        scriptName.contains(RegExp(r'(?<!generated_)tests/dart2js_2/internal')) ||
         scriptName.contains('generated_tests/dart2js_native/native_test');
   }
 
diff --git a/pkg/compiler/lib/src/kernel/element_map_impl.dart b/pkg/compiler/lib/src/kernel/element_map_impl.dart
index 3b7e499cac5..e9f79741039 100644
--- a/pkg/compiler/lib/src/kernel/element_map_impl.dart
+++ b/pkg/compiler/lib/src/kernel/element_map_impl.dart
@@ -916,7 +916,8 @@ class KernelToElementMapImpl implements KernelToElementMap, IrToElementMap {
       var mainUri = elementEnvironment.mainLibrary.canonicalUri;
       // Tests permit lookup outside of dart: libraries.
       return mainUri.path.contains('tests/compiler/dart2js_native') ||
-          mainUri.path.contains('tests/compiler/dart2js_extra');
+          mainUri.path.contains(RegExp(r'(?<!generated_)tests/dart2js_2/internal')) ||
+          mainUri.path.contains(RegExp(r'(?<!generated_)tests/dart2js_2/native'));
     }
 
     DartType lookup(String typeName, {bool required}) {
diff --git a/pkg/compiler/test/codegen/model_data/constant_folding.dart b/pkg/compiler/test/codegen/model_data/constant_folding.dart
index 4b0d8c28cf3..af6a2e66a37 100644
--- a/pkg/compiler/test/codegen/model_data/constant_folding.dart
+++ b/pkg/compiler/test/codegen/model_data/constant_folding.dart
@@ -4,7 +4,7 @@
 
 // @dart = 2.7
 
-// Derived from dart2js_extra/constant_folding_test
+// Derived from tests/dart2js_2/constant_folding_test
 
 import "package:expect/expect.dart";
 
diff --git a/pkg/compiler/test/member_usage/data/constant_folding.dart b/pkg/compiler/test/member_usage/data/constant_folding.dart
index 89dd97f66a0..e36e8d439ef 100644
--- a/pkg/compiler/test/member_usage/data/constant_folding.dart
+++ b/pkg/compiler/test/member_usage/data/constant_folding.dart
@@ -4,7 +4,7 @@
 
 // @dart = 2.7
 
-// Derived from dart2js_extra/constant_folding_test
+// Derived from tests/dart2js_2/constant_folding_test
 
 import "package:expect/expect.dart";
 
diff --git a/pkg/compiler/test/model/native_test.dart b/pkg/compiler/test/model/native_test.dart
index fda38050f5d..e0858429e17 100644
--- a/pkg/compiler/test/model/native_test.dart
+++ b/pkg/compiler/test/model/native_test.dart
@@ -20,7 +20,7 @@ enum Kind {
 
 main() {
   asyncTest(() async {
-    await runTest('tests/compiler/dart2js_extra/jsinterop_test.dart', '', {
+    await runTest('tests/dart2js_2/jsinterop_test.dart', '', {
       'Class': Kind.regular,
       'JsInteropClass': Kind.jsInterop,
       'topLevelField': Kind.regular,
@@ -80,7 +80,7 @@ main() {
       '53',
       '54',
     ]);
-    await runTest('tests/compiler/dart2js_extra/non_jsinterop_test.dart', '', {
+    await runTest('tests/dart2js_2/non_jsinterop_test.dart', '', {
       'Class': Kind.regular,
       'JsInteropClass': Kind.jsInterop,
       'topLevelField': Kind.regular,
diff --git a/pkg/compiler/test/rti/data/as.dart b/pkg/compiler/test/rti/data/as.dart
index d61df9a9790..a8c9d3e5915 100644
--- a/pkg/compiler/test/rti/data/as.dart
+++ b/pkg/compiler/test/rti/data/as.dart
@@ -4,7 +4,7 @@
 
 // @dart = 2.7
 
-// Derived from dart2js_extra/generic_type_error_message_test.
+// Derived from tests/dart2js_2/generic_type_error_message_test.
 
 import 'package:expect/expect.dart';
 
diff --git a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
index 1860a719047..f36c5340c06 100644
--- a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
@@ -424,9 +424,9 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
 
   static const List<String> optOutTestPaths = [
     'co19_2/',
-    'compiler/dart2js_extra/',
     'compiler/dart2js_native/',
     'corelib_2/',
+    'dart2js_2/',
     'ffi_2',
     'language_2/',
     'lib_2/',
diff --git a/pkg/front_end/test/fasta/parser/parser.status b/pkg/front_end/test/fasta/parser/parser.status
index 821a4bae164..07063b9e2ef 100644
--- a/pkg/front_end/test/fasta/parser/parser.status
+++ b/pkg/front_end/test/fasta/parser/parser.status
@@ -1540,15 +1540,6 @@ tests/co19/src/LibTest/html/HttpRequest/responseType_A01_t03: Fail
 tests/co19/src/WebPlatformTest/dom/nodes/Document-createElement_t01: Fail
 tests/co19/src/WebPlatformTest/dom/nodes/DOMImplementation-createHTMLDocument_t01: Fail
 tests/co19/src/WebPlatformTest/dom/nodes/Element-childElementCount-nochild_t01: Fail
-tests/compiler/dart2js_extra/deferred_custom_loader_test: Fail
-tests/compiler/dart2js_extra/empty_negative_test: Fail
-tests/compiler/dart2js_extra/invalid_annotation_test: Fail
-tests/compiler/dart2js_extra/invalid_annotation2_test: Fail
-tests/compiler/dart2js_extra/invalid_length_negative_test: Fail
-tests/compiler/dart2js_extra/LayoutTests_fast_mediastream_getusermedia_t01_test: Fail
-tests/compiler/dart2js_extra/switch_test: Fail
-tests/compiler/dart2js_extra/timer_negative_test: Fail
-tests/compiler/dart2js_extra/typed_locals_test: Fail
 tests/compiler/dart2js_native/abstract_class_test: Fail
 tests/compiler/dart2js_native/bound_closure_test: Fail
 tests/compiler/dart2js_native/browser_compat_1_prepatched_test: Fail
@@ -1650,6 +1641,15 @@ tests/corelib_strong/symbol_reserved_word_test: Fail
 tests/corelib/from_environment_const_type_test: Fail
 tests/corelib/from_environment_const_type_undefined_test: Fail
 tests/corelib/symbol_reserved_word_test: Fail
+tests/dart2js_2/deferred_custom_loader_test: Fail
+tests/dart2js_2/empty_negative_test: Fail
+tests/dart2js_2/invalid_annotation_test: Fail
+tests/dart2js_2/invalid_annotation2_test: Fail
+tests/dart2js_2/invalid_length_negative_test: Fail
+tests/dart2js_2/LayoutTests_fast_mediastream_getusermedia_t01_test: Fail
+tests/dart2js_2/switch_test: Fail
+tests/dart2js_2/timer_negative_test: Fail
+tests/dart2js_2/typed_locals_test: Fail
 tests/language_2/abstract_syntax_test: Fail
 tests/language_2/arg_param_trailing_comma_test: Fail
 tests/language_strong/argument_definition_test: Fail
diff --git a/pkg/front_end/test/fasta/scanner/scanner.status b/pkg/front_end/test/fasta/scanner/scanner.status
index 4cdc798eeff..1fa275a9e19 100644
--- a/pkg/front_end/test/fasta/scanner/scanner.status
+++ b/pkg/front_end/test/fasta/scanner/scanner.status
@@ -3,9 +3,9 @@
 # BSD-style license that can be found in the LICENSE.md file.
 
 pkg/testing/test/dart_sdk_negative_test: Fail
-tests/compiler/dart2js_extra/empty_negative_test: Fail
-tests/compiler/dart2js_extra/invalid_length_negative_test: Fail
-tests/compiler/dart2js_extra/timer_negative_test: Fail
+tests/dart2js_2/empty_negative_test: Fail
+tests/dart2js_2/invalid_length_negative_test: Fail
+tests/dart2js_2/timer_negative_test: Fail
 tests/language_strong/assign_instance_method_negative_test: Fail
 tests/language_strong/bad_initializer1_negative_test: Fail
 tests/language_strong/bad_initializer2_negative_test: Fail
diff --git a/pkg/front_end/testing.json b/pkg/front_end/testing.json
index f8257ff5d0f..84ef1b0262a 100644
--- a/pkg/front_end/testing.json
+++ b/pkg/front_end/testing.json
@@ -409,7 +409,7 @@
       "command-lines": [
         "--checked dart2js",
         "-cdart2js -rd8 --exclude-suite=observatory_ui",
-        "-cdart2js -rd8 dart2js_extra dart2js_native"
+        "-cdart2js -rd8 dart2js_2 dart2js_native"
       ]
     },
     {
@@ -436,7 +436,7 @@
         "-t240 --checked pkg/(kernel|front_end|fasta) dart2js",
         "-cdartk -rvm",
         "-cdart2js -rd8 --exclude-suite=observatory_ui",
-        "-cdart2js -rd8 dart2js_extra dart2js_native"
+        "-cdart2js -rd8 dart2js_2 dart2js_native"
       ]
     },
     {
@@ -447,7 +447,7 @@
       "mode": "release",
       "common": "--dart2js-batch --time -pcolor --report -ax64 -mrelease --write-result-log",
       "command-lines": [
-        "-cdart2js -rd8 --use-sdk --minified language language_2 dart2js_extra dart2js_native corelib corelib_2"
+        "-cdart2js -rd8 --use-sdk --minified language language_2 dart2js_2 dart2js_native corelib corelib_2"
       ]
     }
   ],
diff --git a/pkg/test_runner/lib/src/test_configurations.dart b/pkg/test_runner/lib/src/test_configurations.dart
index c1af470871d..4107748e48a 100644
--- a/pkg/test_runner/lib/src/test_configurations.dart
+++ b/pkg/test_runner/lib/src/test_configurations.dart
@@ -32,11 +32,11 @@ final testSuiteDirectories = [
   Path('runtime/observatory/tests/observatory_ui'),
   Path('samples'),
   Path('samples-dev'),
-  Path('tests/compiler/dart2js_extra'),
   Path('tests/compiler/dart2js_native'),
   Path('tests/compiler/dartdevc_native'),
   Path('tests/corelib'),
   Path('tests/corelib_2'),
+  Path('tests/dart2js_2'),
   Path('tests/kernel'),
   Path('tests/language'),
   Path('tests/language_2'),
diff --git a/sdk/lib/_internal/js_runtime/lib/js_helper.dart b/sdk/lib/_internal/js_runtime/lib/js_helper.dart
index 0600bf70018..cf0fcbb7268 100644
--- a/sdk/lib/_internal/js_runtime/lib/js_helper.dart
+++ b/sdk/lib/_internal/js_runtime/lib/js_helper.dart
@@ -3543,7 +3543,7 @@ void registerGlobalObject(object) {}
 // This is currently a no-op in dart2js.
 void applyExtension(name, nativeObject) {}
 
-// See tests/compiler/dart2js_extra/platform_environment_variable1_test.dart
+// See tests/dart2js_2/platform_environment_variable1_test.dart
 const String testPlatformEnvironmentVariableValue = String.fromEnvironment(
     'dart2js.test.platform.environment.variable',
     defaultValue: 'not-specified');
diff --git a/sdk_nnbd/lib/_internal/js_runtime/lib/js_helper.dart b/sdk_nnbd/lib/_internal/js_runtime/lib/js_helper.dart
index d8c2bc0cf1d..ff906ac29b1 100644
--- a/sdk_nnbd/lib/_internal/js_runtime/lib/js_helper.dart
+++ b/sdk_nnbd/lib/_internal/js_runtime/lib/js_helper.dart
@@ -3569,7 +3569,7 @@ void registerGlobalObject(object) {}
 // This is currently a no-op in dart2js.
 void applyExtension(name, nativeObject) {}
 
-// See tests/compiler/dart2js_extra/platform_environment_variable1_test.dart
+// See tests/dart2js_2/platform_environment_variable1_test.dart
 const String testPlatformEnvironmentVariableValue = String.fromEnvironment(
     'dart2js.test.platform.environment.variable',
     defaultValue: 'not-specified');
diff --git a/tests/compiler/dart2js_extra/10216a_test.dart b/tests/dart2js_2/10216a_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/10216a_test.dart
rename to tests/dart2js_2/10216a_test.dart
diff --git a/tests/compiler/dart2js_extra/10216b_test.dart b/tests/dart2js_2/10216b_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/10216b_test.dart
rename to tests/dart2js_2/10216b_test.dart
diff --git a/tests/compiler/dart2js_extra/11673_test.dart b/tests/dart2js_2/11673_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/11673_test.dart
rename to tests/dart2js_2/11673_test.dart
diff --git a/tests/compiler/dart2js_extra/12320_test.dart b/tests/dart2js_2/12320_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/12320_test.dart
rename to tests/dart2js_2/12320_test.dart
diff --git a/tests/compiler/dart2js_extra/12_test.dart b/tests/dart2js_2/12_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/12_test.dart
rename to tests/dart2js_2/12_test.dart
diff --git a/tests/compiler/dart2js_extra/16400_test.dart b/tests/dart2js_2/16400_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/16400_test.dart
rename to tests/dart2js_2/16400_test.dart
diff --git a/tests/compiler/dart2js_extra/16407_test.dart b/tests/dart2js_2/16407_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/16407_test.dart
rename to tests/dart2js_2/16407_test.dart
diff --git a/tests/compiler/dart2js_extra/16967_test.dart b/tests/dart2js_2/16967_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/16967_test.dart
rename to tests/dart2js_2/16967_test.dart
diff --git a/tests/compiler/dart2js_extra/17094_test.dart b/tests/dart2js_2/17094_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/17094_test.dart
rename to tests/dart2js_2/17094_test.dart
diff --git a/tests/compiler/dart2js_extra/17645_test.dart b/tests/dart2js_2/17645_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/17645_test.dart
rename to tests/dart2js_2/17645_test.dart
diff --git a/tests/compiler/dart2js_extra/17856_test.dart b/tests/dart2js_2/17856_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/17856_test.dart
rename to tests/dart2js_2/17856_test.dart
diff --git a/tests/compiler/dart2js_extra/18383_test.dart b/tests/dart2js_2/18383_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/18383_test.dart
rename to tests/dart2js_2/18383_test.dart
diff --git a/tests/compiler/dart2js_extra/19191_test.dart b/tests/dart2js_2/19191_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/19191_test.dart
rename to tests/dart2js_2/19191_test.dart
diff --git a/tests/compiler/dart2js_extra/21351_test.dart b/tests/dart2js_2/21351_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/21351_test.dart
rename to tests/dart2js_2/21351_test.dart
diff --git a/tests/compiler/dart2js_extra/21579_test.dart b/tests/dart2js_2/21579_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/21579_test.dart
rename to tests/dart2js_2/21579_test.dart
diff --git a/tests/compiler/dart2js_extra/22487_test.dart b/tests/dart2js_2/22487_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/22487_test.dart
rename to tests/dart2js_2/22487_test.dart
diff --git a/tests/compiler/dart2js_extra/22776_test.dart b/tests/dart2js_2/22776_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/22776_test.dart
rename to tests/dart2js_2/22776_test.dart
diff --git a/tests/compiler/dart2js_extra/22868_test.dart b/tests/dart2js_2/22868_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/22868_test.dart
rename to tests/dart2js_2/22868_test.dart
diff --git a/tests/compiler/dart2js_extra/22917_test.dart b/tests/dart2js_2/22917_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/22917_test.dart
rename to tests/dart2js_2/22917_test.dart
diff --git a/tests/compiler/dart2js_extra/23404_test.dart b/tests/dart2js_2/23404_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/23404_test.dart
rename to tests/dart2js_2/23404_test.dart
diff --git a/tests/compiler/dart2js_extra/23432_test.dart b/tests/dart2js_2/23432_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/23432_test.dart
rename to tests/dart2js_2/23432_test.dart
diff --git a/tests/compiler/dart2js_extra/23486_helper.dart b/tests/dart2js_2/23486_helper.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/23486_helper.dart
rename to tests/dart2js_2/23486_helper.dart
diff --git a/tests/compiler/dart2js_extra/23486_test.dart b/tests/dart2js_2/23486_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/23486_test.dart
rename to tests/dart2js_2/23486_test.dart
diff --git a/tests/compiler/dart2js_extra/23804_test.dart b/tests/dart2js_2/23804_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/23804_test.dart
rename to tests/dart2js_2/23804_test.dart
diff --git a/tests/compiler/dart2js_extra/23828_test.dart b/tests/dart2js_2/23828_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/23828_test.dart
rename to tests/dart2js_2/23828_test.dart
diff --git a/tests/compiler/dart2js_extra/26243_test.dart b/tests/dart2js_2/26243_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/26243_test.dart
rename to tests/dart2js_2/26243_test.dart
diff --git a/tests/compiler/dart2js_extra/27198_test.dart b/tests/dart2js_2/27198_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/27198_test.dart
rename to tests/dart2js_2/27198_test.dart
diff --git a/tests/compiler/dart2js_extra/27199_test.dart b/tests/dart2js_2/27199_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/27199_test.dart
rename to tests/dart2js_2/27199_test.dart
diff --git a/tests/compiler/dart2js_extra/27323_test.dart b/tests/dart2js_2/27323_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/27323_test.dart
rename to tests/dart2js_2/27323_test.dart
diff --git a/tests/compiler/dart2js_extra/27354_test.dart b/tests/dart2js_2/27354_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/27354_test.dart
rename to tests/dart2js_2/27354_test.dart
diff --git a/tests/compiler/dart2js_extra/28749_test.dart b/tests/dart2js_2/28749_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/28749_test.dart
rename to tests/dart2js_2/28749_test.dart
diff --git a/tests/compiler/dart2js_extra/28919_test.dart b/tests/dart2js_2/28919_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/28919_test.dart
rename to tests/dart2js_2/28919_test.dart
diff --git a/tests/compiler/dart2js_extra/29130_test.dart b/tests/dart2js_2/29130_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/29130_test.dart
rename to tests/dart2js_2/29130_test.dart
diff --git a/tests/compiler/dart2js_extra/31803_test.dart b/tests/dart2js_2/31803_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/31803_test.dart
rename to tests/dart2js_2/31803_test.dart
diff --git a/tests/compiler/dart2js_extra/32770a_test.dart b/tests/dart2js_2/32770a_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32770a_test.dart
rename to tests/dart2js_2/32770a_test.dart
diff --git a/tests/compiler/dart2js_extra/32770b_test.dart b/tests/dart2js_2/32770b_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32770b_test.dart
rename to tests/dart2js_2/32770b_test.dart
diff --git a/tests/compiler/dart2js_extra/32770c_test.dart b/tests/dart2js_2/32770c_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32770c_test.dart
rename to tests/dart2js_2/32770c_test.dart
diff --git a/tests/compiler/dart2js_extra/32774_test.dart b/tests/dart2js_2/32774_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32774_test.dart
rename to tests/dart2js_2/32774_test.dart
diff --git a/tests/compiler/dart2js_extra/32828_test.dart b/tests/dart2js_2/32828_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32828_test.dart
rename to tests/dart2js_2/32828_test.dart
diff --git a/tests/compiler/dart2js_extra/32853_test.dart b/tests/dart2js_2/32853_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32853_test.dart
rename to tests/dart2js_2/32853_test.dart
diff --git a/tests/compiler/dart2js_extra/32928_test.dart b/tests/dart2js_2/32928_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32928_test.dart
rename to tests/dart2js_2/32928_test.dart
diff --git a/tests/compiler/dart2js_extra/32969_test.dart b/tests/dart2js_2/32969_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32969_test.dart
rename to tests/dart2js_2/32969_test.dart
diff --git a/tests/compiler/dart2js_extra/32997a_lib.dart b/tests/dart2js_2/32997a_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32997a_lib.dart
rename to tests/dart2js_2/32997a_lib.dart
diff --git a/tests/compiler/dart2js_extra/32997a_test.dart b/tests/dart2js_2/32997a_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32997a_test.dart
rename to tests/dart2js_2/32997a_test.dart
diff --git a/tests/compiler/dart2js_extra/32997b_lib.dart b/tests/dart2js_2/32997b_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32997b_lib.dart
rename to tests/dart2js_2/32997b_lib.dart
diff --git a/tests/compiler/dart2js_extra/32997b_test.dart b/tests/dart2js_2/32997b_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/32997b_test.dart
rename to tests/dart2js_2/32997b_test.dart
diff --git a/tests/compiler/dart2js_extra/33296_test.dart b/tests/dart2js_2/33296_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/33296_test.dart
rename to tests/dart2js_2/33296_test.dart
diff --git a/tests/compiler/dart2js_extra/33572_test.dart b/tests/dart2js_2/33572_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/33572_test.dart
rename to tests/dart2js_2/33572_test.dart
diff --git a/tests/compiler/dart2js_extra/33_test.dart b/tests/dart2js_2/33_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/33_test.dart
rename to tests/dart2js_2/33_test.dart
diff --git a/tests/compiler/dart2js_extra/34156_test.dart b/tests/dart2js_2/34156_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/34156_test.dart
rename to tests/dart2js_2/34156_test.dart
diff --git a/tests/compiler/dart2js_extra/34701_test.dart b/tests/dart2js_2/34701_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/34701_test.dart
rename to tests/dart2js_2/34701_test.dart
diff --git a/tests/compiler/dart2js_extra/35341_test.dart b/tests/dart2js_2/35341_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/35341_test.dart
rename to tests/dart2js_2/35341_test.dart
diff --git a/tests/compiler/dart2js_extra/35356_test.dart b/tests/dart2js_2/35356_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/35356_test.dart
rename to tests/dart2js_2/35356_test.dart
diff --git a/tests/compiler/dart2js_extra/35853_test.dart b/tests/dart2js_2/35853_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/35853_test.dart
rename to tests/dart2js_2/35853_test.dart
diff --git a/tests/compiler/dart2js_extra/35965a_test.dart b/tests/dart2js_2/35965a_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/35965a_test.dart
rename to tests/dart2js_2/35965a_test.dart
diff --git a/tests/compiler/dart2js_extra/37494_test.dart b/tests/dart2js_2/37494_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/37494_test.dart
rename to tests/dart2js_2/37494_test.dart
diff --git a/tests/compiler/dart2js_extra/37576_test.dart b/tests/dart2js_2/37576_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/37576_test.dart
rename to tests/dart2js_2/37576_test.dart
diff --git a/tests/compiler/dart2js_extra/38005_test.dart b/tests/dart2js_2/38005_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/38005_test.dart
rename to tests/dart2js_2/38005_test.dart
diff --git a/tests/compiler/dart2js_extra/38949_test.dart b/tests/dart2js_2/38949_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/38949_test.dart
rename to tests/dart2js_2/38949_test.dart
diff --git a/tests/compiler/dart2js_extra/3_test.dart b/tests/dart2js_2/3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/3_test.dart
rename to tests/dart2js_2/3_test.dart
diff --git a/tests/compiler/dart2js_extra/40152a_test.dart b/tests/dart2js_2/40152a_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/40152a_test.dart
rename to tests/dart2js_2/40152a_test.dart
diff --git a/tests/compiler/dart2js_extra/40902_test.dart b/tests/dart2js_2/40902_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/40902_test.dart
rename to tests/dart2js_2/40902_test.dart
diff --git a/tests/compiler/dart2js_extra/43_test.dart b/tests/dart2js_2/43_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/43_test.dart
rename to tests/dart2js_2/43_test.dart
diff --git a/tests/compiler/dart2js_extra/7_test.dart b/tests/dart2js_2/7_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/7_test.dart
rename to tests/dart2js_2/7_test.dart
diff --git a/tests/compiler/dart2js_extra/881_test.dart b/tests/dart2js_2/881_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/881_test.dart
rename to tests/dart2js_2/881_test.dart
diff --git a/tests/compiler/dart2js_extra/LayoutTests_fast_mediastream_getusermedia_t01_test.dart b/tests/dart2js_2/LayoutTests_fast_mediastream_getusermedia_t01_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/LayoutTests_fast_mediastream_getusermedia_t01_test.dart
rename to tests/dart2js_2/LayoutTests_fast_mediastream_getusermedia_t01_test.dart
diff --git a/tests/compiler/dart2js_extra/assert_with_message_test.dart b/tests/dart2js_2/assert_with_message_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/assert_with_message_test.dart
rename to tests/dart2js_2/assert_with_message_test.dart
diff --git a/tests/compiler/dart2js_extra/async_helper.dart b/tests/dart2js_2/async_helper.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/async_helper.dart
rename to tests/dart2js_2/async_helper.dart
diff --git a/tests/compiler/dart2js_extra/async_stacktrace_test.dart b/tests/dart2js_2/async_stacktrace_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/async_stacktrace_test.dart
rename to tests/dart2js_2/async_stacktrace_test.dart
diff --git a/tests/compiler/dart2js_extra/big_allocation_expression_test.dart b/tests/dart2js_2/big_allocation_expression_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/big_allocation_expression_test.dart
rename to tests/dart2js_2/big_allocation_expression_test.dart
diff --git a/tests/compiler/dart2js_extra/block_expression_on_field_test.dart b/tests/dart2js_2/block_expression_on_field_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/block_expression_on_field_test.dart
rename to tests/dart2js_2/block_expression_on_field_test.dart
diff --git a/tests/compiler/dart2js_extra/boolean_conversion_test.dart b/tests/dart2js_2/boolean_conversion_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/boolean_conversion_test.dart
rename to tests/dart2js_2/boolean_conversion_test.dart
diff --git a/tests/compiler/dart2js_extra/bound_closure_interceptor_methods_test.dart b/tests/dart2js_2/bound_closure_interceptor_methods_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bound_closure_interceptor_methods_test.dart
rename to tests/dart2js_2/bound_closure_interceptor_methods_test.dart
diff --git a/tests/compiler/dart2js_extra/bound_closure_interceptor_type_test.dart b/tests/dart2js_2/bound_closure_interceptor_type_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bound_closure_interceptor_type_test.dart
rename to tests/dart2js_2/bound_closure_interceptor_type_test.dart
diff --git a/tests/compiler/dart2js_extra/bounded_type_literal_test.dart b/tests/dart2js_2/bounded_type_literal_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bounded_type_literal_test.dart
rename to tests/dart2js_2/bounded_type_literal_test.dart
diff --git a/tests/compiler/dart2js_extra/bounds_check1a_test.dart b/tests/dart2js_2/bounds_check1a_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bounds_check1a_test.dart
rename to tests/dart2js_2/bounds_check1a_test.dart
diff --git a/tests/compiler/dart2js_extra/bounds_check1b_test.dart b/tests/dart2js_2/bounds_check1b_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bounds_check1b_test.dart
rename to tests/dart2js_2/bounds_check1b_test.dart
diff --git a/tests/compiler/dart2js_extra/bounds_check2a_test.dart b/tests/dart2js_2/bounds_check2a_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bounds_check2a_test.dart
rename to tests/dart2js_2/bounds_check2a_test.dart
diff --git a/tests/compiler/dart2js_extra/bounds_check2b_test.dart b/tests/dart2js_2/bounds_check2b_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bounds_check2b_test.dart
rename to tests/dart2js_2/bounds_check2b_test.dart
diff --git a/tests/compiler/dart2js_extra/bounds_check3a_test.dart b/tests/dart2js_2/bounds_check3a_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bounds_check3a_test.dart
rename to tests/dart2js_2/bounds_check3a_test.dart
diff --git a/tests/compiler/dart2js_extra/bounds_check3b_test.dart b/tests/dart2js_2/bounds_check3b_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bounds_check3b_test.dart
rename to tests/dart2js_2/bounds_check3b_test.dart
diff --git a/tests/compiler/dart2js_extra/bounds_check3c_test.dart b/tests/dart2js_2/bounds_check3c_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bounds_check3c_test.dart
rename to tests/dart2js_2/bounds_check3c_test.dart
diff --git a/tests/compiler/dart2js_extra/bounds_check4a_test.dart b/tests/dart2js_2/bounds_check4a_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bounds_check4a_test.dart
rename to tests/dart2js_2/bounds_check4a_test.dart
diff --git a/tests/compiler/dart2js_extra/bounds_check4b_test.dart b/tests/dart2js_2/bounds_check4b_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bounds_check4b_test.dart
rename to tests/dart2js_2/bounds_check4b_test.dart
diff --git a/tests/compiler/dart2js_extra/bounds_check_test.dart b/tests/dart2js_2/bounds_check_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/bounds_check_test.dart
rename to tests/dart2js_2/bounds_check_test.dart
diff --git a/tests/compiler/dart2js_extra/break_test.dart b/tests/dart2js_2/break_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/break_test.dart
rename to tests/dart2js_2/break_test.dart
diff --git a/tests/compiler/dart2js_extra/call_is_function_test.dart b/tests/dart2js_2/call_is_function_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/call_is_function_test.dart
rename to tests/dart2js_2/call_is_function_test.dart
diff --git a/tests/compiler/dart2js_extra/call_signature_test.dart b/tests/dart2js_2/call_signature_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/call_signature_test.dart
rename to tests/dart2js_2/call_signature_test.dart
diff --git a/tests/compiler/dart2js_extra/call_uninlined_test.dart b/tests/dart2js_2/call_uninlined_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/call_uninlined_test.dart
rename to tests/dart2js_2/call_uninlined_test.dart
diff --git a/tests/compiler/dart2js_extra/cfe_instance_constant_test.dart b/tests/dart2js_2/cfe_instance_constant_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/cfe_instance_constant_test.dart
rename to tests/dart2js_2/cfe_instance_constant_test.dart
diff --git a/tests/compiler/dart2js_extra/checked_setter_test.dart b/tests/dart2js_2/checked_setter_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/checked_setter_test.dart
rename to tests/dart2js_2/checked_setter_test.dart
diff --git a/tests/compiler/dart2js_extra/class_hierarchy_extends_clause_test.dart b/tests/dart2js_2/class_hierarchy_extends_clause_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/class_hierarchy_extends_clause_test.dart
rename to tests/dart2js_2/class_hierarchy_extends_clause_test.dart
diff --git a/tests/compiler/dart2js_extra/closure2_test.dart b/tests/dart2js_2/closure2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure2_test.dart
rename to tests/dart2js_2/closure2_test.dart
diff --git a/tests/compiler/dart2js_extra/closure3_test.dart b/tests/dart2js_2/closure3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure3_test.dart
rename to tests/dart2js_2/closure3_test.dart
diff --git a/tests/compiler/dart2js_extra/closure4_test.dart b/tests/dart2js_2/closure4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure4_test.dart
rename to tests/dart2js_2/closure4_test.dart
diff --git a/tests/compiler/dart2js_extra/closure5_test.dart b/tests/dart2js_2/closure5_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure5_test.dart
rename to tests/dart2js_2/closure5_test.dart
diff --git a/tests/compiler/dart2js_extra/closure6_test.dart b/tests/dart2js_2/closure6_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure6_test.dart
rename to tests/dart2js_2/closure6_test.dart
diff --git a/tests/compiler/dart2js_extra/closure7_test.dart b/tests/dart2js_2/closure7_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure7_test.dart
rename to tests/dart2js_2/closure7_test.dart
diff --git a/tests/compiler/dart2js_extra/closure_capture2_test.dart b/tests/dart2js_2/closure_capture2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure_capture2_test.dart
rename to tests/dart2js_2/closure_capture2_test.dart
diff --git a/tests/compiler/dart2js_extra/closure_capture3_test.dart b/tests/dart2js_2/closure_capture3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure_capture3_test.dart
rename to tests/dart2js_2/closure_capture3_test.dart
diff --git a/tests/compiler/dart2js_extra/closure_capture4_test.dart b/tests/dart2js_2/closure_capture4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure_capture4_test.dart
rename to tests/dart2js_2/closure_capture4_test.dart
diff --git a/tests/compiler/dart2js_extra/closure_capture5_test.dart b/tests/dart2js_2/closure_capture5_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure_capture5_test.dart
rename to tests/dart2js_2/closure_capture5_test.dart
diff --git a/tests/compiler/dart2js_extra/closure_capture6_test.dart b/tests/dart2js_2/closure_capture6_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure_capture6_test.dart
rename to tests/dart2js_2/closure_capture6_test.dart
diff --git a/tests/compiler/dart2js_extra/closure_capture7_test.dart b/tests/dart2js_2/closure_capture7_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure_capture7_test.dart
rename to tests/dart2js_2/closure_capture7_test.dart
diff --git a/tests/compiler/dart2js_extra/closure_capture_test.dart b/tests/dart2js_2/closure_capture_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure_capture_test.dart
rename to tests/dart2js_2/closure_capture_test.dart
diff --git a/tests/compiler/dart2js_extra/closure_signature_unneeded_test.dart b/tests/dart2js_2/closure_signature_unneeded_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure_signature_unneeded_test.dart
rename to tests/dart2js_2/closure_signature_unneeded_test.dart
diff --git a/tests/compiler/dart2js_extra/closure_test.dart b/tests/dart2js_2/closure_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/closure_test.dart
rename to tests/dart2js_2/closure_test.dart
diff --git a/tests/compiler/dart2js_extra/code_motion_exception_test.dart b/tests/dart2js_2/code_motion_exception_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/code_motion_exception_test.dart
rename to tests/dart2js_2/code_motion_exception_test.dart
diff --git a/tests/compiler/dart2js_extra/compile_time_constant4_test.dart b/tests/dart2js_2/compile_time_constant4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/compile_time_constant4_test.dart
rename to tests/dart2js_2/compile_time_constant4_test.dart
diff --git a/tests/compiler/dart2js_extra/compound_operator_index_test.dart b/tests/dart2js_2/compound_operator_index_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/compound_operator_index_test.dart
rename to tests/dart2js_2/compound_operator_index_test.dart
diff --git a/tests/compiler/dart2js_extra/conditional_rewrite_test.dart b/tests/dart2js_2/conditional_rewrite_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/conditional_rewrite_test.dart
rename to tests/dart2js_2/conditional_rewrite_test.dart
diff --git a/tests/compiler/dart2js_extra/conditional_send_test.dart b/tests/dart2js_2/conditional_send_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/conditional_send_test.dart
rename to tests/dart2js_2/conditional_send_test.dart
diff --git a/tests/compiler/dart2js_extra/conditional_test.dart b/tests/dart2js_2/conditional_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/conditional_test.dart
rename to tests/dart2js_2/conditional_test.dart
diff --git a/tests/compiler/dart2js_extra/conflict_index_test.dart b/tests/dart2js_2/conflict_index_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/conflict_index_test.dart
rename to tests/dart2js_2/conflict_index_test.dart
diff --git a/tests/compiler/dart2js_extra/consistent_add_error_test.dart b/tests/dart2js_2/consistent_add_error_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/consistent_add_error_test.dart
rename to tests/dart2js_2/consistent_add_error_test.dart
diff --git a/tests/compiler/dart2js_extra/consistent_codeUnitAt_error_test.dart b/tests/dart2js_2/consistent_codeUnitAt_error_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/consistent_codeUnitAt_error_test.dart
rename to tests/dart2js_2/consistent_codeUnitAt_error_test.dart
diff --git a/tests/compiler/dart2js_extra/consistent_index_error_array_test.dart b/tests/dart2js_2/consistent_index_error_array_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/consistent_index_error_array_test.dart
rename to tests/dart2js_2/consistent_index_error_array_test.dart
diff --git a/tests/compiler/dart2js_extra/consistent_index_error_string_test.dart b/tests/dart2js_2/consistent_index_error_string_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/consistent_index_error_string_test.dart
rename to tests/dart2js_2/consistent_index_error_string_test.dart
diff --git a/tests/compiler/dart2js_extra/consistent_index_error_typed_list_test.dart b/tests/dart2js_2/consistent_index_error_typed_list_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/consistent_index_error_typed_list_test.dart
rename to tests/dart2js_2/consistent_index_error_typed_list_test.dart
diff --git a/tests/compiler/dart2js_extra/consistent_null_add_error_test.dart b/tests/dart2js_2/consistent_null_add_error_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/consistent_null_add_error_test.dart
rename to tests/dart2js_2/consistent_null_add_error_test.dart
diff --git a/tests/compiler/dart2js_extra/consistent_subtract_error_test.dart b/tests/dart2js_2/consistent_subtract_error_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/consistent_subtract_error_test.dart
rename to tests/dart2js_2/consistent_subtract_error_test.dart
diff --git a/tests/compiler/dart2js_extra/consistent_type_error_test.dart b/tests/dart2js_2/consistent_type_error_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/consistent_type_error_test.dart
rename to tests/dart2js_2/consistent_type_error_test.dart
diff --git a/tests/compiler/dart2js_extra/constant_fold_number_dart2_j_s_test.dart b/tests/dart2js_2/constant_fold_number_dart2_j_s_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/constant_fold_number_dart2_j_s_test.dart
rename to tests/dart2js_2/constant_fold_number_dart2_j_s_test.dart
diff --git a/tests/compiler/dart2js_extra/constant_folding2_test.dart b/tests/dart2js_2/constant_folding2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/constant_folding2_test.dart
rename to tests/dart2js_2/constant_folding2_test.dart
diff --git a/tests/compiler/dart2js_extra/constant_folding_test.dart b/tests/dart2js_2/constant_folding_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/constant_folding_test.dart
rename to tests/dart2js_2/constant_folding_test.dart
diff --git a/tests/compiler/dart2js_extra/constant_javascript_semantics2_test.dart b/tests/dart2js_2/constant_javascript_semantics2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/constant_javascript_semantics2_test.dart
rename to tests/dart2js_2/constant_javascript_semantics2_test.dart
diff --git a/tests/compiler/dart2js_extra/constant_javascript_semantics3_test.dart b/tests/dart2js_2/constant_javascript_semantics3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/constant_javascript_semantics3_test.dart
rename to tests/dart2js_2/constant_javascript_semantics3_test.dart
diff --git a/tests/compiler/dart2js_extra/constant_javascript_semantics4_test.dart b/tests/dart2js_2/constant_javascript_semantics4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/constant_javascript_semantics4_test.dart
rename to tests/dart2js_2/constant_javascript_semantics4_test.dart
diff --git a/tests/compiler/dart2js_extra/constant_javascript_semantics_test.dart b/tests/dart2js_2/constant_javascript_semantics_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/constant_javascript_semantics_test.dart
rename to tests/dart2js_2/constant_javascript_semantics_test.dart
diff --git a/tests/compiler/dart2js_extra/constant_javascript_semantics_test5.dart b/tests/dart2js_2/constant_javascript_semantics_test5.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/constant_javascript_semantics_test5.dart
rename to tests/dart2js_2/constant_javascript_semantics_test5.dart
diff --git a/tests/compiler/dart2js_extra/constant_truncate_test.dart b/tests/dart2js_2/constant_truncate_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/constant_truncate_test.dart
rename to tests/dart2js_2/constant_truncate_test.dart
diff --git a/tests/compiler/dart2js_extra/crash_library_metadata.dart b/tests/dart2js_2/crash_library_metadata.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/crash_library_metadata.dart
rename to tests/dart2js_2/crash_library_metadata.dart
diff --git a/tests/compiler/dart2js_extra/dart2js_extra.status b/tests/dart2js_2/dart2js_2.status
similarity index 100%
rename from tests/compiler/dart2js_extra/dart2js_extra.status
rename to tests/dart2js_2/dart2js_2.status
diff --git a/tests/compiler/dart2js_extra/data_uri_test.dart b/tests/dart2js_2/data_uri_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/data_uri_test.dart
rename to tests/dart2js_2/data_uri_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/34219_bounds_lib1.dart b/tests/dart2js_2/deferred/34219_bounds_lib1.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/34219_bounds_lib1.dart
rename to tests/dart2js_2/deferred/34219_bounds_lib1.dart
diff --git a/tests/compiler/dart2js_extra/deferred/34219_bounds_lib2.dart b/tests/dart2js_2/deferred/34219_bounds_lib2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/34219_bounds_lib2.dart
rename to tests/dart2js_2/deferred/34219_bounds_lib2.dart
diff --git a/tests/compiler/dart2js_extra/deferred/34219_bounds_lib3.dart b/tests/dart2js_2/deferred/34219_bounds_lib3.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/34219_bounds_lib3.dart
rename to tests/dart2js_2/deferred/34219_bounds_lib3.dart
diff --git a/tests/compiler/dart2js_extra/deferred/34219_bounds_test.dart b/tests/dart2js_2/deferred/34219_bounds_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/34219_bounds_test.dart
rename to tests/dart2js_2/deferred/34219_bounds_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/34219_signature_lib1.dart b/tests/dart2js_2/deferred/34219_signature_lib1.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/34219_signature_lib1.dart
rename to tests/dart2js_2/deferred/34219_signature_lib1.dart
diff --git a/tests/compiler/dart2js_extra/deferred/34219_signature_lib2.dart b/tests/dart2js_2/deferred/34219_signature_lib2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/34219_signature_lib2.dart
rename to tests/dart2js_2/deferred/34219_signature_lib2.dart
diff --git a/tests/compiler/dart2js_extra/deferred/34219_signature_lib3.dart b/tests/dart2js_2/deferred/34219_signature_lib3.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/34219_signature_lib3.dart
rename to tests/dart2js_2/deferred/34219_signature_lib3.dart
diff --git a/tests/compiler/dart2js_extra/deferred/34219_signature_test.dart b/tests/dart2js_2/deferred/34219_signature_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/34219_signature_test.dart
rename to tests/dart2js_2/deferred/34219_signature_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/default_arg_is_tearoff_lib.dart b/tests/dart2js_2/deferred/default_arg_is_tearoff_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/default_arg_is_tearoff_lib.dart
rename to tests/dart2js_2/deferred/default_arg_is_tearoff_lib.dart
diff --git a/tests/compiler/dart2js_extra/deferred/default_arg_is_tearoff_test.dart b/tests/dart2js_2/deferred/default_arg_is_tearoff_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/default_arg_is_tearoff_test.dart
rename to tests/dart2js_2/deferred/default_arg_is_tearoff_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_class_library.dart b/tests/dart2js_2/deferred/deferred_class_library.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_class_library.dart
rename to tests/dart2js_2/deferred/deferred_class_library.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_class_library2.dart b/tests/dart2js_2/deferred/deferred_class_library2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_class_library2.dart
rename to tests/dart2js_2/deferred/deferred_class_library2.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_class_test.dart b/tests/dart2js_2/deferred/deferred_class_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_class_test.dart
rename to tests/dart2js_2/deferred/deferred_class_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_constant2_test.dart b/tests/dart2js_2/deferred/deferred_constant2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_constant2_test.dart
rename to tests/dart2js_2/deferred/deferred_constant2_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_constant3_test.dart b/tests/dart2js_2/deferred/deferred_constant3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_constant3_test.dart
rename to tests/dart2js_2/deferred/deferred_constant3_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_constant4_test.dart b/tests/dart2js_2/deferred/deferred_constant4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_constant4_test.dart
rename to tests/dart2js_2/deferred/deferred_constant4_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_constant_dependency_evaluation_test.dart b/tests/dart2js_2/deferred/deferred_constant_dependency_evaluation_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_constant_dependency_evaluation_test.dart
rename to tests/dart2js_2/deferred/deferred_constant_dependency_evaluation_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_function_library.dart b/tests/dart2js_2/deferred/deferred_function_library.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_function_library.dart
rename to tests/dart2js_2/deferred/deferred_function_library.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_function_test.dart b/tests/dart2js_2/deferred/deferred_function_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_function_test.dart
rename to tests/dart2js_2/deferred/deferred_function_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_metadata_lib.dart b/tests/dart2js_2/deferred/deferred_metadata_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_metadata_lib.dart
rename to tests/dart2js_2/deferred/deferred_metadata_lib.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_metadata_test.dart b/tests/dart2js_2/deferred/deferred_metadata_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_metadata_test.dart
rename to tests/dart2js_2/deferred/deferred_metadata_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_mirrors2_lib2.dart b/tests/dart2js_2/deferred/deferred_mirrors2_lib2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_mirrors2_lib2.dart
rename to tests/dart2js_2/deferred/deferred_mirrors2_lib2.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_mirrors2_lib4.dart b/tests/dart2js_2/deferred/deferred_mirrors2_lib4.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_mirrors2_lib4.dart
rename to tests/dart2js_2/deferred/deferred_mirrors2_lib4.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_mirrors2_lib5.dart b/tests/dart2js_2/deferred/deferred_mirrors2_lib5.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_mirrors2_lib5.dart
rename to tests/dart2js_2/deferred/deferred_mirrors2_lib5.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_overlapping_lib1.dart b/tests/dart2js_2/deferred/deferred_overlapping_lib1.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_overlapping_lib1.dart
rename to tests/dart2js_2/deferred/deferred_overlapping_lib1.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_overlapping_lib2.dart b/tests/dart2js_2/deferred/deferred_overlapping_lib2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_overlapping_lib2.dart
rename to tests/dart2js_2/deferred/deferred_overlapping_lib2.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_overlapping_lib3.dart b/tests/dart2js_2/deferred/deferred_overlapping_lib3.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_overlapping_lib3.dart
rename to tests/dart2js_2/deferred/deferred_overlapping_lib3.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_overlapping_test.dart b/tests/dart2js_2/deferred/deferred_overlapping_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_overlapping_test.dart
rename to tests/dart2js_2/deferred/deferred_overlapping_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/deferred_unused_classes_test.dart b/tests/dart2js_2/deferred/deferred_unused_classes_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/deferred_unused_classes_test.dart
rename to tests/dart2js_2/deferred/deferred_unused_classes_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/interface_type_variable_lib.dart b/tests/dart2js_2/deferred/interface_type_variable_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/interface_type_variable_lib.dart
rename to tests/dart2js_2/deferred/interface_type_variable_lib.dart
diff --git a/tests/compiler/dart2js_extra/deferred/interface_type_variable_test.dart b/tests/dart2js_2/deferred/interface_type_variable_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/interface_type_variable_test.dart
rename to tests/dart2js_2/deferred/interface_type_variable_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/multiple_default_arg_lib1.dart b/tests/dart2js_2/deferred/multiple_default_arg_lib1.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/multiple_default_arg_lib1.dart
rename to tests/dart2js_2/deferred/multiple_default_arg_lib1.dart
diff --git a/tests/compiler/dart2js_extra/deferred/multiple_default_arg_lib2.dart b/tests/dart2js_2/deferred/multiple_default_arg_lib2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/multiple_default_arg_lib2.dart
rename to tests/dart2js_2/deferred/multiple_default_arg_lib2.dart
diff --git a/tests/compiler/dart2js_extra/deferred/multiple_default_arg_lib3.dart b/tests/dart2js_2/deferred/multiple_default_arg_lib3.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/multiple_default_arg_lib3.dart
rename to tests/dart2js_2/deferred/multiple_default_arg_lib3.dart
diff --git a/tests/compiler/dart2js_extra/deferred/multiple_default_arg_test.dart b/tests/dart2js_2/deferred/multiple_default_arg_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/multiple_default_arg_test.dart
rename to tests/dart2js_2/deferred/multiple_default_arg_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/reflect_multiple_annotations_lib1.dart b/tests/dart2js_2/deferred/reflect_multiple_annotations_lib1.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/reflect_multiple_annotations_lib1.dart
rename to tests/dart2js_2/deferred/reflect_multiple_annotations_lib1.dart
diff --git a/tests/compiler/dart2js_extra/deferred/reflect_multiple_annotations_lib2.dart b/tests/dart2js_2/deferred/reflect_multiple_annotations_lib2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/reflect_multiple_annotations_lib2.dart
rename to tests/dart2js_2/deferred/reflect_multiple_annotations_lib2.dart
diff --git a/tests/compiler/dart2js_extra/deferred/reflect_multiple_default_arg_lib1.dart b/tests/dart2js_2/deferred/reflect_multiple_default_arg_lib1.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/reflect_multiple_default_arg_lib1.dart
rename to tests/dart2js_2/deferred/reflect_multiple_default_arg_lib1.dart
diff --git a/tests/compiler/dart2js_extra/deferred/reflect_multiple_default_arg_lib2.dart b/tests/dart2js_2/deferred/reflect_multiple_default_arg_lib2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/reflect_multiple_default_arg_lib2.dart
rename to tests/dart2js_2/deferred/reflect_multiple_default_arg_lib2.dart
diff --git a/tests/compiler/dart2js_extra/deferred/shared_constant_a.dart b/tests/dart2js_2/deferred/shared_constant_a.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/shared_constant_a.dart
rename to tests/dart2js_2/deferred/shared_constant_a.dart
diff --git a/tests/compiler/dart2js_extra/deferred/shared_constant_b.dart b/tests/dart2js_2/deferred/shared_constant_b.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/shared_constant_b.dart
rename to tests/dart2js_2/deferred/shared_constant_b.dart
diff --git a/tests/compiler/dart2js_extra/deferred/shared_constant_c.dart b/tests/dart2js_2/deferred/shared_constant_c.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/shared_constant_c.dart
rename to tests/dart2js_2/deferred/shared_constant_c.dart
diff --git a/tests/compiler/dart2js_extra/deferred/shared_constant_shared.dart b/tests/dart2js_2/deferred/shared_constant_shared.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/shared_constant_shared.dart
rename to tests/dart2js_2/deferred/shared_constant_shared.dart
diff --git a/tests/compiler/dart2js_extra/deferred/shared_constant_test.dart b/tests/dart2js_2/deferred/shared_constant_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/shared_constant_test.dart
rename to tests/dart2js_2/deferred/shared_constant_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/type_literal_lib.dart b/tests/dart2js_2/deferred/type_literal_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/type_literal_lib.dart
rename to tests/dart2js_2/deferred/type_literal_lib.dart
diff --git a/tests/compiler/dart2js_extra/deferred/type_literal_test.dart b/tests/dart2js_2/deferred/type_literal_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/type_literal_test.dart
rename to tests/dart2js_2/deferred/type_literal_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/typedef_lib.dart b/tests/dart2js_2/deferred/typedef_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/typedef_lib.dart
rename to tests/dart2js_2/deferred/typedef_lib.dart
diff --git a/tests/compiler/dart2js_extra/deferred/typedef_test.dart b/tests/dart2js_2/deferred/typedef_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/typedef_test.dart
rename to tests/dart2js_2/deferred/typedef_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/uninstantiated_type_variable_lib.dart b/tests/dart2js_2/deferred/uninstantiated_type_variable_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/uninstantiated_type_variable_lib.dart
rename to tests/dart2js_2/deferred/uninstantiated_type_variable_lib.dart
diff --git a/tests/compiler/dart2js_extra/deferred/uninstantiated_type_variable_test.dart b/tests/dart2js_2/deferred/uninstantiated_type_variable_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/uninstantiated_type_variable_test.dart
rename to tests/dart2js_2/deferred/uninstantiated_type_variable_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_fail_and_retry_lib.dart b/tests/dart2js_2/deferred_fail_and_retry_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_fail_and_retry_lib.dart
rename to tests/dart2js_2/deferred_fail_and_retry_lib.dart
diff --git a/tests/compiler/dart2js_extra/deferred_fail_and_retry_test.dart b/tests/dart2js_2/deferred_fail_and_retry_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_fail_and_retry_test.dart
rename to tests/dart2js_2/deferred_fail_and_retry_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_function_types1_test.dart b/tests/dart2js_2/deferred_function_types1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_function_types1_test.dart
rename to tests/dart2js_2/deferred_function_types1_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_function_types2_test.dart b/tests/dart2js_2/deferred_function_types2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_function_types2_test.dart
rename to tests/dart2js_2/deferred_function_types2_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_function_types3_test.dart b/tests/dart2js_2/deferred_function_types3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_function_types3_test.dart
rename to tests/dart2js_2/deferred_function_types3_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_function_types4_test.dart b/tests/dart2js_2/deferred_function_types4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_function_types4_test.dart
rename to tests/dart2js_2/deferred_function_types4_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_function_types5_test.dart b/tests/dart2js_2/deferred_function_types5_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_function_types5_test.dart
rename to tests/dart2js_2/deferred_function_types5_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_function_types6_test.dart b/tests/dart2js_2/deferred_function_types6_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_function_types6_test.dart
rename to tests/dart2js_2/deferred_function_types6_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_function_types7_test.dart b/tests/dart2js_2/deferred_function_types7_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_function_types7_test.dart
rename to tests/dart2js_2/deferred_function_types7_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_function_types8_test.dart b/tests/dart2js_2/deferred_function_types8_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_function_types8_test.dart
rename to tests/dart2js_2/deferred_function_types8_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_function_types_lib1.dart b/tests/dart2js_2/deferred_function_types_lib1.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_function_types_lib1.dart
rename to tests/dart2js_2/deferred_function_types_lib1.dart
diff --git a/tests/compiler/dart2js_extra/deferred_function_types_lib2.dart b/tests/dart2js_2/deferred_function_types_lib2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_function_types_lib2.dart
rename to tests/dart2js_2/deferred_function_types_lib2.dart
diff --git a/tests/compiler/dart2js_extra/deferred_inheritance_lib1.dart b/tests/dart2js_2/deferred_inheritance_lib1.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_inheritance_lib1.dart
rename to tests/dart2js_2/deferred_inheritance_lib1.dart
diff --git a/tests/compiler/dart2js_extra/deferred_inheritance_lib2.dart b/tests/dart2js_2/deferred_inheritance_lib2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_inheritance_lib2.dart
rename to tests/dart2js_2/deferred_inheritance_lib2.dart
diff --git a/tests/compiler/dart2js_extra/deferred_inheritance_test.dart b/tests/dart2js_2/deferred_inheritance_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_inheritance_test.dart
rename to tests/dart2js_2/deferred_inheritance_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_split_lib1.dart b/tests/dart2js_2/deferred_split_lib1.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_split_lib1.dart
rename to tests/dart2js_2/deferred_split_lib1.dart
diff --git a/tests/compiler/dart2js_extra/deferred_split_lib2.dart b/tests/dart2js_2/deferred_split_lib2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_split_lib2.dart
rename to tests/dart2js_2/deferred_split_lib2.dart
diff --git a/tests/compiler/dart2js_extra/deferred_split_test.dart b/tests/dart2js_2/deferred_split_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_split_test.dart
rename to tests/dart2js_2/deferred_split_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_tearoff_load_library_lib.dart b/tests/dart2js_2/deferred_tearoff_load_library_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_tearoff_load_library_lib.dart
rename to tests/dart2js_2/deferred_tearoff_load_library_lib.dart
diff --git a/tests/compiler/dart2js_extra/deferred_tearoff_load_library_test.dart b/tests/dart2js_2/deferred_tearoff_load_library_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_tearoff_load_library_test.dart
rename to tests/dart2js_2/deferred_tearoff_load_library_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_with_cross_origin_lib.dart b/tests/dart2js_2/deferred_with_cross_origin_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_with_cross_origin_lib.dart
rename to tests/dart2js_2/deferred_with_cross_origin_lib.dart
diff --git a/tests/compiler/dart2js_extra/deferred_with_cross_origin_test.dart b/tests/dart2js_2/deferred_with_cross_origin_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_with_cross_origin_test.dart
rename to tests/dart2js_2/deferred_with_cross_origin_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_with_csp_nonce2_test.dart b/tests/dart2js_2/deferred_with_csp_nonce2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_with_csp_nonce2_test.dart
rename to tests/dart2js_2/deferred_with_csp_nonce2_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_with_csp_nonce_lib.dart b/tests/dart2js_2/deferred_with_csp_nonce_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_with_csp_nonce_lib.dart
rename to tests/dart2js_2/deferred_with_csp_nonce_lib.dart
diff --git a/tests/compiler/dart2js_extra/deferred_with_csp_nonce_test.dart b/tests/dart2js_2/deferred_with_csp_nonce_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_with_csp_nonce_test.dart
rename to tests/dart2js_2/deferred_with_csp_nonce_test.dart
diff --git a/tests/compiler/dart2js_extra/do_test.dart b/tests/dart2js_2/do_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/do_test.dart
rename to tests/dart2js_2/do_test.dart
diff --git a/tests/compiler/dart2js_extra/dummy_compiler_test.dart b/tests/dart2js_2/dummy_compiler_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/dummy_compiler_test.dart
rename to tests/dart2js_2/dummy_compiler_test.dart
diff --git a/tests/compiler/dart2js_extra/dynamic_bounds_check_test.dart b/tests/dart2js_2/dynamic_bounds_check_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/dynamic_bounds_check_test.dart
rename to tests/dart2js_2/dynamic_bounds_check_test.dart
diff --git a/tests/compiler/dart2js_extra/dynamic_invocation_test.dart b/tests/dart2js_2/dynamic_invocation_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/dynamic_invocation_test.dart
rename to tests/dart2js_2/dynamic_invocation_test.dart
diff --git a/tests/compiler/dart2js_extra/dynamic_type_literal_test.dart b/tests/dart2js_2/dynamic_type_literal_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/dynamic_type_literal_test.dart
rename to tests/dart2js_2/dynamic_type_literal_test.dart
diff --git a/tests/compiler/dart2js_extra/effectively_constant_fields_test.dart b/tests/dart2js_2/effectively_constant_fields_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/effectively_constant_fields_test.dart
rename to tests/dart2js_2/effectively_constant_fields_test.dart
diff --git a/tests/compiler/dart2js_extra/effectively_constant_instance_field_test.dart b/tests/dart2js_2/effectively_constant_instance_field_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/effectively_constant_instance_field_test.dart
rename to tests/dart2js_2/effectively_constant_instance_field_test.dart
diff --git a/tests/compiler/dart2js_extra/empty_method_test.dart b/tests/dart2js_2/empty_method_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/empty_method_test.dart
rename to tests/dart2js_2/empty_method_test.dart
diff --git a/tests/compiler/dart2js_extra/eof_line_ending_test.dart b/tests/dart2js_2/eof_line_ending_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/eof_line_ending_test.dart
rename to tests/dart2js_2/eof_line_ending_test.dart
diff --git a/tests/compiler/dart2js_extra/equals_test.dart b/tests/dart2js_2/equals_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/equals_test.dart
rename to tests/dart2js_2/equals_test.dart
diff --git a/tests/compiler/dart2js_extra/expose_this1_test.dart b/tests/dart2js_2/expose_this1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/expose_this1_test.dart
rename to tests/dart2js_2/expose_this1_test.dart
diff --git a/tests/compiler/dart2js_extra/expose_this2_test.dart b/tests/dart2js_2/expose_this2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/expose_this2_test.dart
rename to tests/dart2js_2/expose_this2_test.dart
diff --git a/tests/compiler/dart2js_extra/field_access_test.dart b/tests/dart2js_2/field_access_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/field_access_test.dart
rename to tests/dart2js_2/field_access_test.dart
diff --git a/tests/compiler/dart2js_extra/field_in_constructor_test.dart b/tests/dart2js_2/field_in_constructor_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/field_in_constructor_test.dart
rename to tests/dart2js_2/field_in_constructor_test.dart
diff --git a/tests/compiler/dart2js_extra/field_initializer_test.dart b/tests/dart2js_2/field_initializer_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/field_initializer_test.dart
rename to tests/dart2js_2/field_initializer_test.dart
diff --git a/tests/compiler/dart2js_extra/fields_test.dart b/tests/dart2js_2/fields_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/fields_test.dart
rename to tests/dart2js_2/fields_test.dart
diff --git a/tests/compiler/dart2js_extra/first_class_types_hashcode_test.dart b/tests/dart2js_2/first_class_types_hashcode_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/first_class_types_hashcode_test.dart
rename to tests/dart2js_2/first_class_types_hashcode_test.dart
diff --git a/tests/compiler/dart2js_extra/fixed_type_argument_implements_test.dart b/tests/dart2js_2/fixed_type_argument_implements_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/fixed_type_argument_implements_test.dart
rename to tests/dart2js_2/fixed_type_argument_implements_test.dart
diff --git a/tests/compiler/dart2js_extra/fixed_type_argument_test.dart b/tests/dart2js_2/fixed_type_argument_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/fixed_type_argument_test.dart
rename to tests/dart2js_2/fixed_type_argument_test.dart
diff --git a/tests/compiler/dart2js_extra/foo7_test.dart b/tests/dart2js_2/foo7_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/foo7_test.dart
rename to tests/dart2js_2/foo7_test.dart
diff --git a/tests/compiler/dart2js_extra/for_in_test.dart b/tests/dart2js_2/for_in_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/for_in_test.dart
rename to tests/dart2js_2/for_in_test.dart
diff --git a/tests/compiler/dart2js_extra/for_test.dart b/tests/dart2js_2/for_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/for_test.dart
rename to tests/dart2js_2/for_test.dart
diff --git a/tests/compiler/dart2js_extra/function_parameters_test.dart b/tests/dart2js_2/function_parameters_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/function_parameters_test.dart
rename to tests/dart2js_2/function_parameters_test.dart
diff --git a/tests/compiler/dart2js_extra/function_typed_arguments_test.dart b/tests/dart2js_2/function_typed_arguments_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/function_typed_arguments_test.dart
rename to tests/dart2js_2/function_typed_arguments_test.dart
diff --git a/tests/compiler/dart2js_extra/generator_elided_parameter_test.dart b/tests/dart2js_2/generator_elided_parameter_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generator_elided_parameter_test.dart
rename to tests/dart2js_2/generator_elided_parameter_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_bounds_test.dart b/tests/dart2js_2/generic_bounds_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_bounds_test.dart
rename to tests/dart2js_2/generic_bounds_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_class_is_test.dart b/tests/dart2js_2/generic_class_is_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_class_is_test.dart
rename to tests/dart2js_2/generic_class_is_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_in_mixin_field_test.dart b/tests/dart2js_2/generic_in_mixin_field_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_in_mixin_field_test.dart
rename to tests/dart2js_2/generic_in_mixin_field_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_in_redirect_test.dart b/tests/dart2js_2/generic_in_redirect_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_in_redirect_test.dart
rename to tests/dart2js_2/generic_in_redirect_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_in_super_test.dart b/tests/dart2js_2/generic_in_super_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_in_super_test.dart
rename to tests/dart2js_2/generic_in_super_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_instantiation1_test.dart b/tests/dart2js_2/generic_instantiation1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_instantiation1_test.dart
rename to tests/dart2js_2/generic_instantiation1_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_instantiation2_test.dart b/tests/dart2js_2/generic_instantiation2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_instantiation2_test.dart
rename to tests/dart2js_2/generic_instantiation2_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_instantiation3_test.dart b/tests/dart2js_2/generic_instantiation3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_instantiation3_test.dart
rename to tests/dart2js_2/generic_instantiation3_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_instantiation4_test.dart b/tests/dart2js_2/generic_instantiation4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_instantiation4_test.dart
rename to tests/dart2js_2/generic_instantiation4_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_method_dynamic_is_test.dart b/tests/dart2js_2/generic_method_dynamic_is_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_method_dynamic_is_test.dart
rename to tests/dart2js_2/generic_method_dynamic_is_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_method_dynamic_type_test.dart b/tests/dart2js_2/generic_method_dynamic_type_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_method_dynamic_type_test.dart
rename to tests/dart2js_2/generic_method_dynamic_type_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_method_static_is_test.dart b/tests/dart2js_2/generic_method_static_is_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_method_static_is_test.dart
rename to tests/dart2js_2/generic_method_static_is_test.dart
diff --git a/tests/compiler/dart2js_extra/generic_type_error_message_test.dart b/tests/dart2js_2/generic_type_error_message_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generic_type_error_message_test.dart
rename to tests/dart2js_2/generic_type_error_message_test.dart
diff --git a/tests/compiler/dart2js_extra/generics_factories_test.dart b/tests/dart2js_2/generics_factories_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generics_factories_test.dart
rename to tests/dart2js_2/generics_factories_test.dart
diff --git a/tests/compiler/dart2js_extra/generics_is_check1_test.dart b/tests/dart2js_2/generics_is_check1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/generics_is_check1_test.dart
rename to tests/dart2js_2/generics_is_check1_test.dart
diff --git a/tests/compiler/dart2js_extra/getter_element_test.dart b/tests/dart2js_2/getter_element_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/getter_element_test.dart
rename to tests/dart2js_2/getter_element_test.dart
diff --git a/tests/compiler/dart2js_extra/getters_setters_test.dart b/tests/dart2js_2/getters_setters_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/getters_setters_test.dart
rename to tests/dart2js_2/getters_setters_test.dart
diff --git a/tests/compiler/dart2js_extra/hash_code_test.dart b/tests/dart2js_2/hash_code_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/hash_code_test.dart
rename to tests/dart2js_2/hash_code_test.dart
diff --git a/tests/compiler/dart2js_extra/identical_trace_test.dart b/tests/dart2js_2/identical_trace_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/identical_trace_test.dart
rename to tests/dart2js_2/identical_trace_test.dart
diff --git a/tests/compiler/dart2js_extra/if_in_loop_test.dart b/tests/dart2js_2/if_in_loop_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/if_in_loop_test.dart
rename to tests/dart2js_2/if_in_loop_test.dart
diff --git a/tests/compiler/dart2js_extra/if_null2_test.dart b/tests/dart2js_2/if_null2_test.dart
similarity index 89%
rename from tests/compiler/dart2js_extra/if_null2_test.dart
rename to tests/dart2js_2/if_null2_test.dart
index 907799a55fe..04e11492630 100644
--- a/tests/compiler/dart2js_extra/if_null2_test.dart
+++ b/tests/dart2js_2/if_null2_test.dart
@@ -5,7 +5,7 @@
 // @dart = 2.7
 
 /// Regression for #24134: inference was not tracking ??= correctly.
-library tests.compiler.dart2js_extra.if_null2_test;
+library dart2js_2.if_null2_test;
 
 import "package:expect/expect.dart";
 
diff --git a/tests/compiler/dart2js_extra/if_null3_test.dart b/tests/dart2js_2/if_null3_test.dart
similarity index 90%
rename from tests/compiler/dart2js_extra/if_null3_test.dart
rename to tests/dart2js_2/if_null3_test.dart
index 49383c10c11..29c4c770ec9 100644
--- a/tests/compiler/dart2js_extra/if_null3_test.dart
+++ b/tests/dart2js_2/if_null3_test.dart
@@ -5,7 +5,7 @@
 // @dart = 2.7
 
 /// Regression for #24135: inference was not tracking `[]??=` correctly.
-library tests.compiler.dart2js_extra.if_null3_test;
+library dart2js_2.if_null3_test;
 
 import "package:expect/expect.dart";
 
diff --git a/tests/compiler/dart2js_extra/if_null_test.dart b/tests/dart2js_2/if_null_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/if_null_test.dart
rename to tests/dart2js_2/if_null_test.dart
diff --git a/tests/compiler/dart2js_extra/if_test.dart b/tests/dart2js_2/if_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/if_test.dart
rename to tests/dart2js_2/if_test.dart
diff --git a/tests/compiler/dart2js_extra/index_test.dart b/tests/dart2js_2/index_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/index_test.dart
rename to tests/dart2js_2/index_test.dart
diff --git a/tests/compiler/dart2js_extra/indirect_type_literal_test.dart b/tests/dart2js_2/indirect_type_literal_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/indirect_type_literal_test.dart
rename to tests/dart2js_2/indirect_type_literal_test.dart
diff --git a/tests/compiler/dart2js_extra/inference_super_set_call_test.dart b/tests/dart2js_2/inference_super_set_call_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/inference_super_set_call_test.dart
rename to tests/dart2js_2/inference_super_set_call_test.dart
diff --git a/tests/compiler/dart2js_extra/inferrer_is_int_test.dart b/tests/dart2js_2/inferrer_is_int_test.dart
similarity index 93%
rename from tests/compiler/dart2js_extra/inferrer_is_int_test.dart
rename to tests/dart2js_2/inferrer_is_int_test.dart
index 056fec615e2..4aa7717c3df 100644
--- a/tests/compiler/dart2js_extra/inferrer_is_int_test.dart
+++ b/tests/dart2js_2/inferrer_is_int_test.dart
@@ -8,7 +8,7 @@
 // literal might become an int at runtime.
 
 import "package:expect/expect.dart";
-import '../../language_2/compiler_annotations.dart';
+import '../language_2/compiler_annotations.dart';
 
 @DontInline()
 callWithStringAndDouble(value) {
diff --git a/tests/compiler/dart2js_extra/injected_cast_test.dart b/tests/dart2js_2/injected_cast_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/injected_cast_test.dart
rename to tests/dart2js_2/injected_cast_test.dart
diff --git a/tests/compiler/dart2js_extra/inline_generic_test.dart b/tests/dart2js_2/inline_generic_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/inline_generic_test.dart
rename to tests/dart2js_2/inline_generic_test.dart
diff --git a/tests/compiler/dart2js_extra/inline_position_crash_source.dart b/tests/dart2js_2/inline_position_crash_source.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/inline_position_crash_source.dart
rename to tests/dart2js_2/inline_position_crash_source.dart
diff --git a/tests/compiler/dart2js_extra/inline_position_crash_test.dart b/tests/dart2js_2/inline_position_crash_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/inline_position_crash_test.dart
rename to tests/dart2js_2/inline_position_crash_test.dart
diff --git a/tests/compiler/dart2js_extra/instantiation_stub_2_test.dart b/tests/dart2js_2/instantiation_stub_2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/instantiation_stub_2_test.dart
rename to tests/dart2js_2/instantiation_stub_2_test.dart
diff --git a/tests/compiler/dart2js_extra/instantiation_stub_test.dart b/tests/dart2js_2/instantiation_stub_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/instantiation_stub_test.dart
rename to tests/dart2js_2/instantiation_stub_test.dart
diff --git a/tests/compiler/dart2js_extra/int_index_test.dart b/tests/dart2js_2/int_index_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/int_index_test.dart
rename to tests/dart2js_2/int_index_test.dart
diff --git a/tests/compiler/dart2js_extra/interceptor_named_arguments_test.dart b/tests/dart2js_2/interceptor_named_arguments_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/interceptor_named_arguments_test.dart
rename to tests/dart2js_2/interceptor_named_arguments_test.dart
diff --git a/tests/compiler/dart2js_extra/interface_type_optimization_test.dart b/tests/dart2js_2/interface_type_optimization_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/interface_type_optimization_test.dart
rename to tests/dart2js_2/interface_type_optimization_test.dart
diff --git a/tests/compiler/dart2js_extra/40296_test.dart b/tests/dart2js_2/internal/40296_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/40296_test.dart
rename to tests/dart2js_2/internal/40296_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred_custom_loader_lib.dart b/tests/dart2js_2/internal/deferred/deferred_custom_loader_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_custom_loader_lib.dart
rename to tests/dart2js_2/internal/deferred/deferred_custom_loader_lib.dart
diff --git a/tests/compiler/dart2js_extra/deferred_custom_loader_test.dart b/tests/dart2js_2/internal/deferred/deferred_custom_loader_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred_custom_loader_test.dart
rename to tests/dart2js_2/internal/deferred/deferred_custom_loader_test.dart
diff --git a/tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib1.dart b/tests/dart2js_2/internal/deferred/load_in_correct_order_lib1.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib1.dart
rename to tests/dart2js_2/internal/deferred/load_in_correct_order_lib1.dart
diff --git a/tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib2.dart b/tests/dart2js_2/internal/deferred/load_in_correct_order_lib2.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib2.dart
rename to tests/dart2js_2/internal/deferred/load_in_correct_order_lib2.dart
diff --git a/tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib3.dart b/tests/dart2js_2/internal/deferred/load_in_correct_order_lib3.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib3.dart
rename to tests/dart2js_2/internal/deferred/load_in_correct_order_lib3.dart
diff --git a/tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib4.dart b/tests/dart2js_2/internal/deferred/load_in_correct_order_lib4.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib4.dart
rename to tests/dart2js_2/internal/deferred/load_in_correct_order_lib4.dart
diff --git a/tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib5.dart b/tests/dart2js_2/internal/deferred/load_in_correct_order_lib5.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib5.dart
rename to tests/dart2js_2/internal/deferred/load_in_correct_order_lib5.dart
diff --git a/tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib6.dart b/tests/dart2js_2/internal/deferred/load_in_correct_order_lib6.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib6.dart
rename to tests/dart2js_2/internal/deferred/load_in_correct_order_lib6.dart
diff --git a/tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib7.dart b/tests/dart2js_2/internal/deferred/load_in_correct_order_lib7.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/load_in_correct_order_lib7.dart
rename to tests/dart2js_2/internal/deferred/load_in_correct_order_lib7.dart
diff --git a/tests/compiler/dart2js_extra/deferred/load_in_correct_order_test.dart b/tests/dart2js_2/internal/deferred/load_in_correct_order_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/deferred/load_in_correct_order_test.dart
rename to tests/dart2js_2/internal/deferred/load_in_correct_order_test.dart
diff --git a/tests/compiler/dart2js_extra/extract_type_arguments_1_test.dart b/tests/dart2js_2/internal/extract_type_arguments_1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/extract_type_arguments_1_test.dart
rename to tests/dart2js_2/internal/extract_type_arguments_1_test.dart
diff --git a/tests/compiler/dart2js_extra/extract_type_arguments_2_test.dart b/tests/dart2js_2/internal/extract_type_arguments_2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/extract_type_arguments_2_test.dart
rename to tests/dart2js_2/internal/extract_type_arguments_2_test.dart
diff --git a/tests/compiler/dart2js_extra/extract_type_arguments_3_test.dart b/tests/dart2js_2/internal/extract_type_arguments_3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/extract_type_arguments_3_test.dart
rename to tests/dart2js_2/internal/extract_type_arguments_3_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string1_test.dart b/tests/dart2js_2/internal/lax_runtime_type_closure_to_string1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string1_test.dart
rename to tests/dart2js_2/internal/lax_runtime_type_closure_to_string1_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string2_test.dart b/tests/dart2js_2/internal/lax_runtime_type_closure_to_string2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string2_test.dart
rename to tests/dart2js_2/internal/lax_runtime_type_closure_to_string2_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string7_test.dart b/tests/dart2js_2/internal/lax_runtime_type_closure_to_string7_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string7_test.dart
rename to tests/dart2js_2/internal/lax_runtime_type_closure_to_string7_test.dart
diff --git a/tests/compiler/dart2js_extra/mock_libraries.dart b/tests/dart2js_2/internal/mock_libraries.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/mock_libraries.dart
rename to tests/dart2js_2/internal/mock_libraries.dart
diff --git a/tests/compiler/dart2js_extra/platform_environment_variable1_test.dart b/tests/dart2js_2/internal/platform_environment_variable1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/platform_environment_variable1_test.dart
rename to tests/dart2js_2/internal/platform_environment_variable1_test.dart
diff --git a/tests/compiler/dart2js_extra/platform_environment_variable2_test.dart b/tests/dart2js_2/internal/platform_environment_variable2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/platform_environment_variable2_test.dart
rename to tests/dart2js_2/internal/platform_environment_variable2_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/bind_test.dart b/tests/dart2js_2/internal/rti/bind_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/bind_test.dart
rename to tests/dart2js_2/internal/rti/bind_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/bound_environment_test.dart b/tests/dart2js_2/internal/rti/bound_environment_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/bound_environment_test.dart
rename to tests/dart2js_2/internal/rti/bound_environment_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/canonical_recipe_test.dart b/tests/dart2js_2/internal/rti/canonical_recipe_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/canonical_recipe_test.dart
rename to tests/dart2js_2/internal/rti/canonical_recipe_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/class_environment_test.dart b/tests/dart2js_2/internal/rti/class_environment_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/class_environment_test.dart
rename to tests/dart2js_2/internal/rti/class_environment_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/constant_type_test.dart b/tests/dart2js_2/internal/rti/constant_type_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/constant_type_test.dart
rename to tests/dart2js_2/internal/rti/constant_type_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/recipe_syntax_test.dart b/tests/dart2js_2/internal/rti/recipe_syntax_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/recipe_syntax_test.dart
rename to tests/dart2js_2/internal/rti/recipe_syntax_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/required_named_parameters_test.dart b/tests/dart2js_2/internal/rti/required_named_parameters_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/required_named_parameters_test.dart
rename to tests/dart2js_2/internal/rti/required_named_parameters_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/runtime_type_1_test.dart b/tests/dart2js_2/internal/rti/runtime_type_1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/runtime_type_1_test.dart
rename to tests/dart2js_2/internal/rti/runtime_type_1_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/runtime_type_2_test.dart b/tests/dart2js_2/internal/rti/runtime_type_2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/runtime_type_2_test.dart
rename to tests/dart2js_2/internal/rti/runtime_type_2_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/runtime_type_3_test.dart b/tests/dart2js_2/internal/rti/runtime_type_3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/runtime_type_3_test.dart
rename to tests/dart2js_2/internal/rti/runtime_type_3_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/simple_2_test.dart b/tests/dart2js_2/internal/rti/simple_2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/simple_2_test.dart
rename to tests/dart2js_2/internal/rti/simple_2_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/simple_is_function_type2_test.dart b/tests/dart2js_2/internal/rti/simple_is_function_type2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/simple_is_function_type2_test.dart
rename to tests/dart2js_2/internal/rti/simple_is_function_type2_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/simple_is_function_type3_test.dart b/tests/dart2js_2/internal/rti/simple_is_function_type3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/simple_is_function_type3_test.dart
rename to tests/dart2js_2/internal/rti/simple_is_function_type3_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/simple_is_function_type_test.dart b/tests/dart2js_2/internal/rti/simple_is_function_type_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/simple_is_function_type_test.dart
rename to tests/dart2js_2/internal/rti/simple_is_function_type_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/simple_is_test.dart b/tests/dart2js_2/internal/rti/simple_is_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/simple_is_test.dart
rename to tests/dart2js_2/internal/rti/simple_is_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/simple_test.dart b/tests/dart2js_2/internal/rti/simple_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/simple_test.dart
rename to tests/dart2js_2/internal/rti/simple_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/simple_type_bound_test.dart b/tests/dart2js_2/internal/rti/simple_type_bound_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/simple_type_bound_test.dart
rename to tests/dart2js_2/internal/rti/simple_type_bound_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/subtype_test.dart b/tests/dart2js_2/internal/rti/subtype_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/subtype_test.dart
rename to tests/dart2js_2/internal/rti/subtype_test.dart
diff --git a/tests/compiler/dart2js_extra/rti/subtype_utils.dart b/tests/dart2js_2/internal/rti/subtype_utils.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/subtype_utils.dart
rename to tests/dart2js_2/internal/rti/subtype_utils.dart
diff --git a/tests/compiler/dart2js_extra/rti/variance_subtype_test.dart b/tests/dart2js_2/internal/rti/variance_subtype_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti/variance_subtype_test.dart
rename to tests/dart2js_2/internal/rti/variance_subtype_test.dart
diff --git a/tests/compiler/dart2js_extra/invalid_annotation_test.dart b/tests/dart2js_2/invalid_annotation_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/invalid_annotation_test.dart
rename to tests/dart2js_2/invalid_annotation_test.dart
diff --git a/tests/compiler/dart2js_extra/invoke_dynamic_test.dart b/tests/dart2js_2/invoke_dynamic_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/invoke_dynamic_test.dart
rename to tests/dart2js_2/invoke_dynamic_test.dart
diff --git a/tests/compiler/dart2js_extra/is_check_instanceof_test.dart b/tests/dart2js_2/is_check_instanceof_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/is_check_instanceof_test.dart
rename to tests/dart2js_2/is_check_instanceof_test.dart
diff --git a/tests/compiler/dart2js_extra/is_operator_test.dart b/tests/dart2js_2/is_operator_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/is_operator_test.dart
rename to tests/dart2js_2/is_operator_test.dart
diff --git a/tests/compiler/dart2js_extra/issue36562_test.dart b/tests/dart2js_2/issue36562_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/issue36562_test.dart
rename to tests/dart2js_2/issue36562_test.dart
diff --git a/tests/compiler/dart2js_extra/js_array_index_error_test.dart b/tests/dart2js_2/js_array_index_error_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/js_array_index_error_test.dart
rename to tests/dart2js_2/js_array_index_error_test.dart
diff --git a/tests/compiler/dart2js_extra/js_array_removeLast_error_test.dart b/tests/dart2js_2/js_array_removeLast_error_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/js_array_removeLast_error_test.dart
rename to tests/dart2js_2/js_array_removeLast_error_test.dart
diff --git a/tests/compiler/dart2js_extra/js_array_sort_default_test.dart b/tests/dart2js_2/js_array_sort_default_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/js_array_sort_default_test.dart
rename to tests/dart2js_2/js_array_sort_default_test.dart
diff --git a/tests/compiler/dart2js_extra/js_interop_cast_test.dart b/tests/dart2js_2/js_interop_cast_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/js_interop_cast_test.dart
rename to tests/dart2js_2/js_interop_cast_test.dart
diff --git a/tests/compiler/dart2js_extra/js_interop_implements_test.dart b/tests/dart2js_2/js_interop_implements_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/js_interop_implements_test.dart
rename to tests/dart2js_2/js_interop_implements_test.dart
diff --git a/tests/compiler/dart2js_extra/js_interop_no_elide_optional_arg_test.dart b/tests/dart2js_2/js_interop_no_elide_optional_arg_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/js_interop_no_elide_optional_arg_test.dart
rename to tests/dart2js_2/js_interop_no_elide_optional_arg_test.dart
diff --git a/tests/compiler/dart2js_extra/js_interop_optional_arg_test.dart b/tests/dart2js_2/js_interop_optional_arg_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/js_interop_optional_arg_test.dart
rename to tests/dart2js_2/js_interop_optional_arg_test.dart
diff --git a/tests/compiler/dart2js_extra/js_interop_test.dart b/tests/dart2js_2/js_interop_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/js_interop_test.dart
rename to tests/dart2js_2/js_interop_test.dart
diff --git a/tests/compiler/dart2js_extra/jsinterop_test.dart b/tests/dart2js_2/jsinterop_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/jsinterop_test.dart
rename to tests/dart2js_2/jsinterop_test.dart
diff --git a/tests/compiler/dart2js_extra/label_test.dart b/tests/dart2js_2/label_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/label_test.dart
rename to tests/dart2js_2/label_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_equals1_test.dart b/tests/dart2js_2/lax_runtime_type_closure_equals1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_equals1_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_equals1_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_equals2_test.dart b/tests/dart2js_2/lax_runtime_type_closure_equals2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_equals2_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_equals2_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_equals3_test.dart b/tests/dart2js_2/lax_runtime_type_closure_equals3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_equals3_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_equals3_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_equals4_test.dart b/tests/dart2js_2/lax_runtime_type_closure_equals4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_equals4_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_equals4_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_equals5_test.dart b/tests/dart2js_2/lax_runtime_type_closure_equals5_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_equals5_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_equals5_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_equals6_test.dart b/tests/dart2js_2/lax_runtime_type_closure_equals6_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_equals6_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_equals6_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_equals7_test.dart b/tests/dart2js_2/lax_runtime_type_closure_equals7_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_equals7_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_equals7_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_equals8_test.dart b/tests/dart2js_2/lax_runtime_type_closure_equals8_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_equals8_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_equals8_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string3_test.dart b/tests/dart2js_2/lax_runtime_type_closure_to_string3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string3_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_to_string3_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string4_test.dart b/tests/dart2js_2/lax_runtime_type_closure_to_string4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string4_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_to_string4_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string5_test.dart b/tests/dart2js_2/lax_runtime_type_closure_to_string5_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string5_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_to_string5_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string6_test.dart b/tests/dart2js_2/lax_runtime_type_closure_to_string6_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_closure_to_string6_test.dart
rename to tests/dart2js_2/lax_runtime_type_closure_to_string6_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_equals1_test.dart b/tests/dart2js_2/lax_runtime_type_equals1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_equals1_test.dart
rename to tests/dart2js_2/lax_runtime_type_equals1_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_equals2_test.dart b/tests/dart2js_2/lax_runtime_type_equals2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_equals2_test.dart
rename to tests/dart2js_2/lax_runtime_type_equals2_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_equals3_test.dart b/tests/dart2js_2/lax_runtime_type_equals3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_equals3_test.dart
rename to tests/dart2js_2/lax_runtime_type_equals3_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_equals4_test.dart b/tests/dart2js_2/lax_runtime_type_equals4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_equals4_test.dart
rename to tests/dart2js_2/lax_runtime_type_equals4_test.dart
diff --git a/tests/compiler/dart2js_extra/lax_runtime_type_instantiate_to_string_test.dart b/tests/dart2js_2/lax_runtime_type_instantiate_to_string_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/lax_runtime_type_instantiate_to_string_test.dart
rename to tests/dart2js_2/lax_runtime_type_instantiate_to_string_test.dart
diff --git a/tests/compiler/dart2js_extra/list_factory_test.dart b/tests/dart2js_2/list_factory_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/list_factory_test.dart
rename to tests/dart2js_2/list_factory_test.dart
diff --git a/tests/compiler/dart2js_extra/literal_string_juxtaposition_test.dart b/tests/dart2js_2/literal_string_juxtaposition_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/literal_string_juxtaposition_test.dart
rename to tests/dart2js_2/literal_string_juxtaposition_test.dart
diff --git a/tests/compiler/dart2js_extra/literals_test.dart b/tests/dart2js_2/literals_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/literals_test.dart
rename to tests/dart2js_2/literals_test.dart
diff --git a/tests/compiler/dart2js_extra/local_function_call2_test.dart b/tests/dart2js_2/local_function_call2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/local_function_call2_test.dart
rename to tests/dart2js_2/local_function_call2_test.dart
diff --git a/tests/compiler/dart2js_extra/local_function_call_test.dart b/tests/dart2js_2/local_function_call_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/local_function_call_test.dart
rename to tests/dart2js_2/local_function_call_test.dart
diff --git a/tests/compiler/dart2js_extra/local_function_generic_strong_test.dart b/tests/dart2js_2/local_function_generic_strong_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/local_function_generic_strong_test.dart
rename to tests/dart2js_2/local_function_generic_strong_test.dart
diff --git a/tests/compiler/dart2js_extra/local_function_signatures_strong_test.dart b/tests/dart2js_2/local_function_signatures_strong_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/local_function_signatures_strong_test.dart
rename to tests/dart2js_2/local_function_signatures_strong_test.dart
diff --git a/tests/compiler/dart2js_extra/local_function_signatures_test.dart b/tests/dart2js_2/local_function_signatures_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/local_function_signatures_test.dart
rename to tests/dart2js_2/local_function_signatures_test.dart
diff --git a/tests/compiler/dart2js_extra/local_signature_test.dart b/tests/dart2js_2/local_signature_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/local_signature_test.dart
rename to tests/dart2js_2/local_signature_test.dart
diff --git a/tests/compiler/dart2js_extra/locals_test.dart b/tests/dart2js_2/locals_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/locals_test.dart
rename to tests/dart2js_2/locals_test.dart
diff --git a/tests/compiler/dart2js_extra/logical_and_test.dart b/tests/dart2js_2/logical_and_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/logical_and_test.dart
rename to tests/dart2js_2/logical_and_test.dart
diff --git a/tests/compiler/dart2js_extra/logical_or_test.dart b/tests/dart2js_2/logical_or_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/logical_or_test.dart
rename to tests/dart2js_2/logical_or_test.dart
diff --git a/tests/compiler/dart2js_extra/loop_if_phi_test.dart b/tests/dart2js_2/loop_if_phi_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/loop_if_phi_test.dart
rename to tests/dart2js_2/loop_if_phi_test.dart
diff --git a/tests/compiler/dart2js_extra/many_constants_test.dart b/tests/dart2js_2/many_constants_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/many_constants_test.dart
rename to tests/dart2js_2/many_constants_test.dart
diff --git a/tests/compiler/dart2js_extra/many_fields_test.dart b/tests/dart2js_2/many_fields_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/many_fields_test.dart
rename to tests/dart2js_2/many_fields_test.dart
diff --git a/tests/compiler/dart2js_extra/many_instantiations_test.dart b/tests/dart2js_2/many_instantiations_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/many_instantiations_test.dart
rename to tests/dart2js_2/many_instantiations_test.dart
diff --git a/tests/compiler/dart2js_extra/map_to_set_test.dart b/tests/dart2js_2/map_to_set_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/map_to_set_test.dart
rename to tests/dart2js_2/map_to_set_test.dart
diff --git a/tests/compiler/dart2js_extra/math_lib_prefix_test.dart b/tests/dart2js_2/math_lib_prefix_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/math_lib_prefix_test.dart
rename to tests/dart2js_2/math_lib_prefix_test.dart
diff --git a/tests/compiler/dart2js_extra/math_lib_test.dart b/tests/dart2js_2/math_lib_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/math_lib_test.dart
rename to tests/dart2js_2/math_lib_test.dart
diff --git a/tests/compiler/dart2js_extra/member_namespace_test.dart b/tests/dart2js_2/member_namespace_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/member_namespace_test.dart
rename to tests/dart2js_2/member_namespace_test.dart
diff --git a/tests/compiler/dart2js_extra/method_signatures_strong_test.dart b/tests/dart2js_2/method_signatures_strong_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/method_signatures_strong_test.dart
rename to tests/dart2js_2/method_signatures_strong_test.dart
diff --git a/tests/compiler/dart2js_extra/method_signatures_test.dart b/tests/dart2js_2/method_signatures_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/method_signatures_test.dart
rename to tests/dart2js_2/method_signatures_test.dart
diff --git a/tests/compiler/dart2js_extra/minus_zero2_test.dart b/tests/dart2js_2/minus_zero2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/minus_zero2_test.dart
rename to tests/dart2js_2/minus_zero2_test.dart
diff --git a/tests/compiler/dart2js_extra/minus_zero_test.dart b/tests/dart2js_2/minus_zero_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/minus_zero_test.dart
rename to tests/dart2js_2/minus_zero_test.dart
diff --git a/tests/compiler/dart2js_extra/mixin_subtype_test.dart b/tests/dart2js_2/mixin_subtype_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/mixin_subtype_test.dart
rename to tests/dart2js_2/mixin_subtype_test.dart
diff --git a/tests/compiler/dart2js_extra/mixin_type_variable_test.dart b/tests/dart2js_2/mixin_type_variable_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/mixin_type_variable_test.dart
rename to tests/dart2js_2/mixin_type_variable_test.dart
diff --git a/tests/compiler/dart2js_extra/multi_global_def_single_instantiation_test.dart b/tests/dart2js_2/multi_global_def_single_instantiation_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/multi_global_def_single_instantiation_test.dart
rename to tests/dart2js_2/multi_global_def_single_instantiation_test.dart
diff --git a/tests/compiler/dart2js_extra/named_mixin_runtime_type_test.dart b/tests/dart2js_2/named_mixin_runtime_type_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/named_mixin_runtime_type_test.dart
rename to tests/dart2js_2/named_mixin_runtime_type_test.dart
diff --git a/tests/compiler/dart2js_extra/named_parameter_for_static_test.dart b/tests/dart2js_2/named_parameter_for_static_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/named_parameter_for_static_test.dart
rename to tests/dart2js_2/named_parameter_for_static_test.dart
diff --git a/tests/compiler/dart2js_extra/named_parameter_test.dart b/tests/dart2js_2/named_parameter_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/named_parameter_test.dart
rename to tests/dart2js_2/named_parameter_test.dart
diff --git a/tests/compiler/dart2js_extra/nan_negate_test.dart b/tests/dart2js_2/nan_negate_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/nan_negate_test.dart
rename to tests/dart2js_2/nan_negate_test.dart
diff --git a/tests/compiler/dart2js_extra/new_from_env_test.dart b/tests/dart2js_2/new_from_env_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/new_from_env_test.dart
rename to tests/dart2js_2/new_from_env_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong10_test.dart b/tests/dart2js_2/no_such_method_strong10_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong10_test.dart
rename to tests/dart2js_2/no_such_method_strong10_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong11_lib.dart b/tests/dart2js_2/no_such_method_strong11_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong11_lib.dart
rename to tests/dart2js_2/no_such_method_strong11_lib.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong11_test.dart b/tests/dart2js_2/no_such_method_strong11_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong11_test.dart
rename to tests/dart2js_2/no_such_method_strong11_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong12_test.dart b/tests/dart2js_2/no_such_method_strong12_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong12_test.dart
rename to tests/dart2js_2/no_such_method_strong12_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong1_test.dart b/tests/dart2js_2/no_such_method_strong1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong1_test.dart
rename to tests/dart2js_2/no_such_method_strong1_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong2_test.dart b/tests/dart2js_2/no_such_method_strong2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong2_test.dart
rename to tests/dart2js_2/no_such_method_strong2_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong3_test.dart b/tests/dart2js_2/no_such_method_strong3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong3_test.dart
rename to tests/dart2js_2/no_such_method_strong3_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong4_test.dart b/tests/dart2js_2/no_such_method_strong4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong4_test.dart
rename to tests/dart2js_2/no_such_method_strong4_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong5_test.dart b/tests/dart2js_2/no_such_method_strong5_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong5_test.dart
rename to tests/dart2js_2/no_such_method_strong5_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong6_test.dart b/tests/dart2js_2/no_such_method_strong6_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong6_test.dart
rename to tests/dart2js_2/no_such_method_strong6_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong7_test.dart b/tests/dart2js_2/no_such_method_strong7_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong7_test.dart
rename to tests/dart2js_2/no_such_method_strong7_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong8_test.dart b/tests/dart2js_2/no_such_method_strong8_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong8_test.dart
rename to tests/dart2js_2/no_such_method_strong8_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_strong9_test.dart b/tests/dart2js_2/no_such_method_strong9_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_strong9_test.dart
rename to tests/dart2js_2/no_such_method_strong9_test.dart
diff --git a/tests/compiler/dart2js_extra/no_such_method_test.dart b/tests/dart2js_2/no_such_method_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/no_such_method_test.dart
rename to tests/dart2js_2/no_such_method_test.dart
diff --git a/tests/compiler/dart2js_extra/non_jsinterop_test.dart b/tests/dart2js_2/non_jsinterop_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/non_jsinterop_test.dart
rename to tests/dart2js_2/non_jsinterop_test.dart
diff --git a/tests/compiler/dart2js_extra/non_trivial_substitution_test.dart b/tests/dart2js_2/non_trivial_substitution_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/non_trivial_substitution_test.dart
rename to tests/dart2js_2/non_trivial_substitution_test.dart
diff --git a/tests/compiler/dart2js_extra/not_equals_test.dart b/tests/dart2js_2/not_equals_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/not_equals_test.dart
rename to tests/dart2js_2/not_equals_test.dart
diff --git a/tests/compiler/dart2js_extra/not_test.dart b/tests/dart2js_2/not_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/not_test.dart
rename to tests/dart2js_2/not_test.dart
diff --git a/tests/compiler/dart2js_extra/null_stacktrace_test.dart b/tests/dart2js_2/null_stacktrace_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/null_stacktrace_test.dart
rename to tests/dart2js_2/null_stacktrace_test.dart
diff --git a/tests/compiler/dart2js_extra/null_test.dart b/tests/dart2js_2/null_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/null_test.dart
rename to tests/dart2js_2/null_test.dart
diff --git a/tests/compiler/dart2js_extra/operator2_test.dart b/tests/dart2js_2/operator2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/operator2_test.dart
rename to tests/dart2js_2/operator2_test.dart
diff --git a/tests/compiler/dart2js_extra/operator3_test.dart b/tests/dart2js_2/operator3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/operator3_test.dart
rename to tests/dart2js_2/operator3_test.dart
diff --git a/tests/compiler/dart2js_extra/operator_equals_test.dart b/tests/dart2js_2/operator_equals_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/operator_equals_test.dart
rename to tests/dart2js_2/operator_equals_test.dart
diff --git a/tests/compiler/dart2js_extra/operator_test.dart b/tests/dart2js_2/operator_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/operator_test.dart
rename to tests/dart2js_2/operator_test.dart
diff --git a/tests/compiler/dart2js_extra/optional_parameter_test.dart b/tests/dart2js_2/optional_parameter_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/optional_parameter_test.dart
rename to tests/dart2js_2/optional_parameter_test.dart
diff --git a/tests/compiler/dart2js_extra/panda_lib.dart b/tests/dart2js_2/panda_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/panda_lib.dart
rename to tests/dart2js_2/panda_lib.dart
diff --git a/tests/compiler/dart2js_extra/panda_test.dart b/tests/dart2js_2/panda_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/panda_test.dart
rename to tests/dart2js_2/panda_test.dart
diff --git a/tests/compiler/dart2js_extra/phi_elimination_test.dart b/tests/dart2js_2/phi_elimination_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/phi_elimination_test.dart
rename to tests/dart2js_2/phi_elimination_test.dart
diff --git a/tests/compiler/dart2js_extra/phi_gvn_test.dart b/tests/dart2js_2/phi_gvn_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/phi_gvn_test.dart
rename to tests/dart2js_2/phi_gvn_test.dart
diff --git a/tests/compiler/dart2js_extra/phi_test.dart b/tests/dart2js_2/phi_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/phi_test.dart
rename to tests/dart2js_2/phi_test.dart
diff --git a/tests/compiler/dart2js_extra/private_symbol_literal_test.dart b/tests/dart2js_2/private_symbol_literal_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/private_symbol_literal_test.dart
rename to tests/dart2js_2/private_symbol_literal_test.dart
diff --git a/tests/compiler/dart2js_extra/recursive_metadata_test.dart b/tests/dart2js_2/recursive_metadata_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/recursive_metadata_test.dart
rename to tests/dart2js_2/recursive_metadata_test.dart
diff --git a/tests/compiler/dart2js_extra/regress/41781_test.dart b/tests/dart2js_2/regress/41781_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress/41781_test.dart
rename to tests/dart2js_2/regress/41781_test.dart
diff --git a/tests/compiler/dart2js_extra/regress/4434_lib.dart b/tests/dart2js_2/regress/4434_lib.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress/4434_lib.dart
rename to tests/dart2js_2/regress/4434_lib.dart
diff --git a/tests/compiler/dart2js_extra/regress/4434_test.dart b/tests/dart2js_2/regress/4434_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress/4434_test.dart
rename to tests/dart2js_2/regress/4434_test.dart
diff --git a/tests/compiler/dart2js_extra/regress/4492_test.dart b/tests/dart2js_2/regress/4492_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress/4492_test.dart
rename to tests/dart2js_2/regress/4492_test.dart
diff --git a/tests/compiler/dart2js_extra/regress/4515_1_test.dart b/tests/dart2js_2/regress/4515_1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress/4515_1_test.dart
rename to tests/dart2js_2/regress/4515_1_test.dart
diff --git a/tests/compiler/dart2js_extra/regress/4515_2_test.dart b/tests/dart2js_2/regress/4515_2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress/4515_2_test.dart
rename to tests/dart2js_2/regress/4515_2_test.dart
diff --git a/tests/compiler/dart2js_extra/regress/4515_3_test.dart b/tests/dart2js_2/regress/4515_3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress/4515_3_test.dart
rename to tests/dart2js_2/regress/4515_3_test.dart
diff --git a/tests/compiler/dart2js_extra/regress/4562_test.dart b/tests/dart2js_2/regress/4562_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress/4562_test.dart
rename to tests/dart2js_2/regress/4562_test.dart
diff --git a/tests/compiler/dart2js_extra/regress/4639_test.dart b/tests/dart2js_2/regress/4639_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress/4639_test.dart
rename to tests/dart2js_2/regress/4639_test.dart
diff --git a/tests/compiler/dart2js_extra/regress/regression_type_variables_is_test.dart b/tests/dart2js_2/regress/regression_type_variables_is_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress/regression_type_variables_is_test.dart
rename to tests/dart2js_2/regress/regression_type_variables_is_test.dart
diff --git a/tests/compiler/dart2js_extra/regress/unused_generator_type_parameter_test.dart b/tests/dart2js_2/regress/unused_generator_type_parameter_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress/unused_generator_type_parameter_test.dart
rename to tests/dart2js_2/regress/unused_generator_type_parameter_test.dart
diff --git a/tests/compiler/dart2js_extra/regress_32069_test.dart b/tests/dart2js_2/regress_32069_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress_32069_test.dart
rename to tests/dart2js_2/regress_32069_test.dart
diff --git a/tests/compiler/dart2js_extra/regress_36222_test.dart b/tests/dart2js_2/regress_36222_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress_36222_test.dart
rename to tests/dart2js_2/regress_36222_test.dart
diff --git a/tests/compiler/dart2js_extra/regress_40349_test.dart b/tests/dart2js_2/regress_40349_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress_40349_test.dart
rename to tests/dart2js_2/regress_40349_test.dart
diff --git a/tests/compiler/dart2js_extra/regress_null_aware_test.dart b/tests/dart2js_2/regress_null_aware_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regress_null_aware_test.dart
rename to tests/dart2js_2/regress_null_aware_test.dart
diff --git a/tests/compiler/dart2js_extra/regression_2913_test.dart b/tests/dart2js_2/regression_2913_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/regression_2913_test.dart
rename to tests/dart2js_2/regression_2913_test.dart
diff --git a/tests/compiler/dart2js_extra/replaced_type_variable_test.dart b/tests/dart2js_2/replaced_type_variable_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/replaced_type_variable_test.dart
rename to tests/dart2js_2/replaced_type_variable_test.dart
diff --git a/tests/compiler/dart2js_extra/return_setter_test.dart b/tests/dart2js_2/return_setter_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/return_setter_test.dart
rename to tests/dart2js_2/return_setter_test.dart
diff --git a/tests/compiler/dart2js_extra/round_constant_folding_test.dart b/tests/dart2js_2/round_constant_folding_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/round_constant_folding_test.dart
rename to tests/dart2js_2/round_constant_folding_test.dart
diff --git a/tests/compiler/dart2js_extra/rti_need_for_closure_signature_test.dart b/tests/dart2js_2/rti_need_for_closure_signature_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti_need_for_closure_signature_test.dart
rename to tests/dart2js_2/rti_need_for_closure_signature_test.dart
diff --git a/tests/compiler/dart2js_extra/rti_need_for_runtime_type_test.dart b/tests/dart2js_2/rti_need_for_runtime_type_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/rti_need_for_runtime_type_test.dart
rename to tests/dart2js_2/rti_need_for_runtime_type_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_closure_equals1_test.dart b/tests/dart2js_2/runtime_type_closure_equals1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_closure_equals1_test.dart
rename to tests/dart2js_2/runtime_type_closure_equals1_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_closure_equals2_test.dart b/tests/dart2js_2/runtime_type_closure_equals2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_closure_equals2_test.dart
rename to tests/dart2js_2/runtime_type_closure_equals2_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_closure_equals3_test.dart b/tests/dart2js_2/runtime_type_closure_equals3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_closure_equals3_test.dart
rename to tests/dart2js_2/runtime_type_closure_equals3_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_closure_equals4_test.dart b/tests/dart2js_2/runtime_type_closure_equals4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_closure_equals4_test.dart
rename to tests/dart2js_2/runtime_type_closure_equals4_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_closure_equals5_test.dart b/tests/dart2js_2/runtime_type_closure_equals5_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_closure_equals5_test.dart
rename to tests/dart2js_2/runtime_type_closure_equals5_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_closure_equals6_test.dart b/tests/dart2js_2/runtime_type_closure_equals6_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_closure_equals6_test.dart
rename to tests/dart2js_2/runtime_type_closure_equals6_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_closure_equals7_test.dart b/tests/dart2js_2/runtime_type_closure_equals7_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_closure_equals7_test.dart
rename to tests/dart2js_2/runtime_type_closure_equals7_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_closure_equals8_test.dart b/tests/dart2js_2/runtime_type_closure_equals8_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_closure_equals8_test.dart
rename to tests/dart2js_2/runtime_type_closure_equals8_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_equals1_test.dart b/tests/dart2js_2/runtime_type_equals1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_equals1_test.dart
rename to tests/dart2js_2/runtime_type_equals1_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_equals2_test.dart b/tests/dart2js_2/runtime_type_equals2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_equals2_test.dart
rename to tests/dart2js_2/runtime_type_equals2_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_equals3_test.dart b/tests/dart2js_2/runtime_type_equals3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_equals3_test.dart
rename to tests/dart2js_2/runtime_type_equals3_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_equals4_test.dart b/tests/dart2js_2/runtime_type_equals4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_equals4_test.dart
rename to tests/dart2js_2/runtime_type_equals4_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_equals5_test.dart b/tests/dart2js_2/runtime_type_equals5_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_equals5_test.dart
rename to tests/dart2js_2/runtime_type_equals5_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_equals6_test.dart b/tests/dart2js_2/runtime_type_equals6_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_equals6_test.dart
rename to tests/dart2js_2/runtime_type_equals6_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_equals7_test.dart b/tests/dart2js_2/runtime_type_equals7_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_equals7_test.dart
rename to tests/dart2js_2/runtime_type_equals7_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_equals8_test.dart b/tests/dart2js_2/runtime_type_equals8_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_equals8_test.dart
rename to tests/dart2js_2/runtime_type_equals8_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_int_test.dart b/tests/dart2js_2/runtime_type_int_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_int_test.dart
rename to tests/dart2js_2/runtime_type_int_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_test.dart b/tests/dart2js_2/runtime_type_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_test.dart
rename to tests/dart2js_2/runtime_type_test.dart
diff --git a/tests/compiler/dart2js_extra/runtime_type_to_string1_test.dart b/tests/dart2js_2/runtime_type_to_string1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/runtime_type_to_string1_test.dart
rename to tests/dart2js_2/runtime_type_to_string1_test.dart
diff --git a/tests/compiler/dart2js_extra/send_test.dart b/tests/dart2js_2/send_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/send_test.dart
rename to tests/dart2js_2/send_test.dart
diff --git a/tests/compiler/dart2js_extra/simple_string_constant_test.dart b/tests/dart2js_2/simple_string_constant_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/simple_string_constant_test.dart
rename to tests/dart2js_2/simple_string_constant_test.dart
diff --git a/tests/compiler/dart2js_extra/source_mapping_crash_source.dart b/tests/dart2js_2/source_mapping_crash_source.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/source_mapping_crash_source.dart
rename to tests/dart2js_2/source_mapping_crash_source.dart
diff --git a/tests/compiler/dart2js_extra/source_mapping_crash_test.dart b/tests/dart2js_2/source_mapping_crash_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/source_mapping_crash_test.dart
rename to tests/dart2js_2/source_mapping_crash_test.dart
diff --git a/tests/compiler/dart2js_extra/statements_test.dart b/tests/dart2js_2/statements_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/statements_test.dart
rename to tests/dart2js_2/statements_test.dart
diff --git a/tests/compiler/dart2js_extra/static_field2_test.dart b/tests/dart2js_2/static_field2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/static_field2_test.dart
rename to tests/dart2js_2/static_field2_test.dart
diff --git a/tests/compiler/dart2js_extra/static_field_test.dart b/tests/dart2js_2/static_field_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/static_field_test.dart
rename to tests/dart2js_2/static_field_test.dart
diff --git a/tests/compiler/dart2js_extra/static_method2_test.dart b/tests/dart2js_2/static_method2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/static_method2_test.dart
rename to tests/dart2js_2/static_method2_test.dart
diff --git a/tests/compiler/dart2js_extra/static_method_test.dart b/tests/dart2js_2/static_method_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/static_method_test.dart
rename to tests/dart2js_2/static_method_test.dart
diff --git a/tests/compiler/dart2js_extra/static_var_no_initializer_test.dart b/tests/dart2js_2/static_var_no_initializer_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/static_var_no_initializer_test.dart
rename to tests/dart2js_2/static_var_no_initializer_test.dart
diff --git a/tests/compiler/dart2js_extra/static_var_test.dart b/tests/dart2js_2/static_var_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/static_var_test.dart
rename to tests/dart2js_2/static_var_test.dart
diff --git a/tests/compiler/dart2js_extra/string_escape_test.dart b/tests/dart2js_2/string_escape_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/string_escape_test.dart
rename to tests/dart2js_2/string_escape_test.dart
diff --git a/tests/compiler/dart2js_extra/string_interpolation_dynamic_test.dart b/tests/dart2js_2/string_interpolation_dynamic_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/string_interpolation_dynamic_test.dart
rename to tests/dart2js_2/string_interpolation_dynamic_test.dart
diff --git a/tests/compiler/dart2js_extra/string_interpolation_opt1_test.dart b/tests/dart2js_2/string_interpolation_opt1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/string_interpolation_opt1_test.dart
rename to tests/dart2js_2/string_interpolation_opt1_test.dart
diff --git a/tests/compiler/dart2js_extra/string_interpolation_test.dart b/tests/dart2js_2/string_interpolation_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/string_interpolation_test.dart
rename to tests/dart2js_2/string_interpolation_test.dart
diff --git a/tests/compiler/dart2js_extra/super_call_test.dart b/tests/dart2js_2/super_call_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/super_call_test.dart
rename to tests/dart2js_2/super_call_test.dart
diff --git a/tests/compiler/dart2js_extra/super_constructor1_test.dart b/tests/dart2js_2/super_constructor1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/super_constructor1_test.dart
rename to tests/dart2js_2/super_constructor1_test.dart
diff --git a/tests/compiler/dart2js_extra/super_constructor2_test.dart b/tests/dart2js_2/super_constructor2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/super_constructor2_test.dart
rename to tests/dart2js_2/super_constructor2_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin10_test.dart b/tests/dart2js_2/supermixin/supermixin10_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin10_test.dart
rename to tests/dart2js_2/supermixin/supermixin10_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin11_test.dart b/tests/dart2js_2/supermixin/supermixin11_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin11_test.dart
rename to tests/dart2js_2/supermixin/supermixin11_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin12_test.dart b/tests/dart2js_2/supermixin/supermixin12_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin12_test.dart
rename to tests/dart2js_2/supermixin/supermixin12_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin13_test.dart b/tests/dart2js_2/supermixin/supermixin13_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin13_test.dart
rename to tests/dart2js_2/supermixin/supermixin13_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin14_test.dart b/tests/dart2js_2/supermixin/supermixin14_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin14_test.dart
rename to tests/dart2js_2/supermixin/supermixin14_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin15_test.dart b/tests/dart2js_2/supermixin/supermixin15_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin15_test.dart
rename to tests/dart2js_2/supermixin/supermixin15_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin16_test.dart b/tests/dart2js_2/supermixin/supermixin16_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin16_test.dart
rename to tests/dart2js_2/supermixin/supermixin16_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin17_test.dart b/tests/dart2js_2/supermixin/supermixin17_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin17_test.dart
rename to tests/dart2js_2/supermixin/supermixin17_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin18_test.dart b/tests/dart2js_2/supermixin/supermixin18_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin18_test.dart
rename to tests/dart2js_2/supermixin/supermixin18_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin1_test.dart b/tests/dart2js_2/supermixin/supermixin1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin1_test.dart
rename to tests/dart2js_2/supermixin/supermixin1_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin2_test.dart b/tests/dart2js_2/supermixin/supermixin2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin2_test.dart
rename to tests/dart2js_2/supermixin/supermixin2_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin3_test.dart b/tests/dart2js_2/supermixin/supermixin3_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin3_test.dart
rename to tests/dart2js_2/supermixin/supermixin3_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin4_test.dart b/tests/dart2js_2/supermixin/supermixin4_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin4_test.dart
rename to tests/dart2js_2/supermixin/supermixin4_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin5_test.dart b/tests/dart2js_2/supermixin/supermixin5_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin5_test.dart
rename to tests/dart2js_2/supermixin/supermixin5_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin6_test.dart b/tests/dart2js_2/supermixin/supermixin6_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin6_test.dart
rename to tests/dart2js_2/supermixin/supermixin6_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin7_test.dart b/tests/dart2js_2/supermixin/supermixin7_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin7_test.dart
rename to tests/dart2js_2/supermixin/supermixin7_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin8_test.dart b/tests/dart2js_2/supermixin/supermixin8_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin8_test.dart
rename to tests/dart2js_2/supermixin/supermixin8_test.dart
diff --git a/tests/compiler/dart2js_extra/supermixin/supermixin9_test.dart b/tests/dart2js_2/supermixin/supermixin9_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/supermixin/supermixin9_test.dart
rename to tests/dart2js_2/supermixin/supermixin9_test.dart
diff --git a/tests/compiler/dart2js_extra/switch_equals_test.dart b/tests/dart2js_2/switch_equals_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/switch_equals_test.dart
rename to tests/dart2js_2/switch_equals_test.dart
diff --git a/tests/compiler/dart2js_extra/switch_test.dart b/tests/dart2js_2/switch_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/switch_test.dart
rename to tests/dart2js_2/switch_test.dart
diff --git a/tests/compiler/dart2js_extra/tear_off_types_test.dart b/tests/dart2js_2/tear_off_types_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/tear_off_types_test.dart
rename to tests/dart2js_2/tear_off_types_test.dart
diff --git a/tests/compiler/dart2js_extra/this_phi_elimination_test.dart b/tests/dart2js_2/this_phi_elimination_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/this_phi_elimination_test.dart
rename to tests/dart2js_2/this_phi_elimination_test.dart
diff --git a/tests/compiler/dart2js_extra/this_redirecting_constructor_test.dart b/tests/dart2js_2/this_redirecting_constructor_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/this_redirecting_constructor_test.dart
rename to tests/dart2js_2/this_redirecting_constructor_test.dart
diff --git a/tests/compiler/dart2js_extra/this_test.dart b/tests/dart2js_2/this_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/this_test.dart
rename to tests/dart2js_2/this_test.dart
diff --git a/tests/compiler/dart2js_extra/throw1_test.dart b/tests/dart2js_2/throw1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/throw1_test.dart
rename to tests/dart2js_2/throw1_test.dart
diff --git a/tests/compiler/dart2js_extra/throw2_test.dart b/tests/dart2js_2/throw2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/throw2_test.dart
rename to tests/dart2js_2/throw2_test.dart
diff --git a/tests/compiler/dart2js_extra/timer_test.dart b/tests/dart2js_2/timer_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/timer_test.dart
rename to tests/dart2js_2/timer_test.dart
diff --git a/tests/compiler/dart2js_extra/to_string_test.dart b/tests/dart2js_2/to_string_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/to_string_test.dart
rename to tests/dart2js_2/to_string_test.dart
diff --git a/tests/compiler/dart2js_extra/truncation_errors_test.dart b/tests/dart2js_2/truncation_errors_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/truncation_errors_test.dart
rename to tests/dart2js_2/truncation_errors_test.dart
diff --git a/tests/compiler/dart2js_extra/type_argument_factory_crash_test.dart b/tests/dart2js_2/type_argument_factory_crash_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/type_argument_factory_crash_test.dart
rename to tests/dart2js_2/type_argument_factory_crash_test.dart
diff --git a/tests/compiler/dart2js_extra/type_argument_factory_nocrash_test.dart b/tests/dart2js_2/type_argument_factory_nocrash_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/type_argument_factory_nocrash_test.dart
rename to tests/dart2js_2/type_argument_factory_nocrash_test.dart
diff --git a/tests/compiler/dart2js_extra/type_argument_optimization_test.dart b/tests/dart2js_2/type_argument_optimization_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/type_argument_optimization_test.dart
rename to tests/dart2js_2/type_argument_optimization_test.dart
diff --git a/tests/compiler/dart2js_extra/type_constant_switch_test.dart b/tests/dart2js_2/type_constant_switch_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/type_constant_switch_test.dart
rename to tests/dart2js_2/type_constant_switch_test.dart
diff --git a/tests/compiler/dart2js_extra/type_error_message_test.dart b/tests/dart2js_2/type_error_message_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/type_error_message_test.dart
rename to tests/dart2js_2/type_error_message_test.dart
diff --git a/tests/compiler/dart2js_extra/type_literal2_test.dart b/tests/dart2js_2/type_literal2_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/type_literal2_test.dart
rename to tests/dart2js_2/type_literal2_test.dart
diff --git a/tests/compiler/dart2js_extra/type_literal_test.dart b/tests/dart2js_2/type_literal_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/type_literal_test.dart
rename to tests/dart2js_2/type_literal_test.dart
diff --git a/tests/compiler/dart2js_extra/typevariable_factory_test.dart b/tests/dart2js_2/typevariable_factory_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/typevariable_factory_test.dart
rename to tests/dart2js_2/typevariable_factory_test.dart
diff --git a/tests/compiler/dart2js_extra/typevariable_substitution_test.dart b/tests/dart2js_2/typevariable_substitution_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/typevariable_substitution_test.dart
rename to tests/dart2js_2/typevariable_substitution_test.dart
diff --git a/tests/compiler/dart2js_extra/typevariable_typedef_test.dart b/tests/dart2js_2/typevariable_typedef_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/typevariable_typedef_test.dart
rename to tests/dart2js_2/typevariable_typedef_test.dart
diff --git a/tests/compiler/dart2js_extra/unconditional_dartio_import_test.dart b/tests/dart2js_2/unconditional_dartio_import_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/unconditional_dartio_import_test.dart
rename to tests/dart2js_2/unconditional_dartio_import_test.dart
diff --git a/tests/compiler/dart2js_extra/unused_local_const_test.dart b/tests/dart2js_2/unused_local_const_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/unused_local_const_test.dart
rename to tests/dart2js_2/unused_local_const_test.dart
diff --git a/tests/compiler/dart2js_extra/useful_error_message_1_test.dart b/tests/dart2js_2/useful_error_message_1_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/useful_error_message_1_test.dart
rename to tests/dart2js_2/useful_error_message_1_test.dart
diff --git a/tests/compiler/dart2js_extra/while_test.dart b/tests/dart2js_2/while_test.dart
similarity index 100%
rename from tests/compiler/dart2js_extra/while_test.dart
rename to tests/dart2js_2/while_test.dart
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 720e7c07b1f..7183dde1322 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -2452,7 +2452,7 @@
           "arguments": [
             "-ndart2js-hostasserts-linux-ia32-d8",
             "--dart2js-batch",
-            "dart2js_extra",
+            "dart2js_2",
             "dart2js_native"
           ]
         }
@@ -2482,8 +2482,8 @@
             "--dart2js-batch",
             "language_2",
             "corelib_2",
-            "dart2js_native",
-            "dart2js_extra"
+            "dart2js_2",
+            "dart2js_native"
           ],
           "shards": 6,
           "fileset": "dart2js_hostasserts_prennbd"
@@ -2558,7 +2558,7 @@
             "-ndart2js-${system}-${runtime}",
             "--dart2js-batch",
             "--reset-browser-configuration",
-            "dart2js_extra",
+            "dart2js_2",
             "dart2js_native"
           ]
         }
@@ -2610,7 +2610,7 @@
           "arguments": [
             "-ndart2js-minified-linux-d8",
             "--dart2js-batch",
-            "dart2js_extra",
+            "dart2js_2",
             "dart2js_native"
           ]
         },
@@ -2629,7 +2629,7 @@
           "arguments": [
             "-ndart2js-production-linux-d8",
             "--dart2js-batch",
-            "dart2js_extra",
+            "dart2js_2",
             "dart2js_native"
           ]
         }
@@ -2684,7 +2684,7 @@
           "arguments": [
             "-ndart2js-minified-csp-linux-chrome",
             "--dart2js-batch",
-            "dart2js_extra",
+            "dart2js_2",
             "dart2js_native"
           ]
         }
@@ -2723,7 +2723,7 @@
             "--dart2js-batch",
             "language",
             "corelib",
-            "dart2js_extra",
+            "dart2js_2",
             "dart2js_native",
             "kernel"
           ],
@@ -2757,7 +2757,7 @@
             "--dart2js-batch",
             "language",
             "corelib",
-            "dart2js_extra",
+            "dart2js_2",
             "dart2js_native",
             "kernel"
           ],
@@ -2788,7 +2788,7 @@
           "name": "dart2js nnbd unit tests",
           "arguments": [
             "-nunittest-weak-asserts-no-sdk-linux",
-            "dart2js",
+            "dart2js_2",
             "pkg//compiler/"
           ]
         }