diff --git a/tests/corelib/integer_arith_vm_test.dart b/runtime/tests/vm/dart/corelib/integer_arith_vm_test.dart similarity index 100% rename from tests/corelib/integer_arith_vm_test.dart rename to runtime/tests/vm/dart/corelib/integer_arith_vm_test.dart diff --git a/tests/corelib/integer_parsed_arith_vm_test.dart b/runtime/tests/vm/dart/corelib/integer_parsed_arith_vm_test.dart similarity index 100% rename from tests/corelib/integer_parsed_arith_vm_test.dart rename to runtime/tests/vm/dart/corelib/integer_parsed_arith_vm_test.dart diff --git a/tests/corelib/integer_parsed_div_rem_vm_test.dart b/runtime/tests/vm/dart/corelib/integer_parsed_div_rem_vm_test.dart similarity index 100% rename from tests/corelib/integer_parsed_div_rem_vm_test.dart rename to runtime/tests/vm/dart/corelib/integer_parsed_div_rem_vm_test.dart diff --git a/tests/corelib/integer_parsed_mul_div_vm_test.dart b/runtime/tests/vm/dart/corelib/integer_parsed_mul_div_vm_test.dart similarity index 100% rename from tests/corelib/integer_parsed_mul_div_vm_test.dart rename to runtime/tests/vm/dart/corelib/integer_parsed_mul_div_vm_test.dart diff --git a/tests/corelib/string_base_vm_test.dart b/runtime/tests/vm/dart/corelib/string_base_vm_test.dart similarity index 100% rename from tests/corelib/string_base_vm_test.dart rename to runtime/tests/vm/dart/corelib/string_base_vm_test.dart diff --git a/tests/language/vm/allocate_overflow_array_test.dart b/runtime/tests/vm/dart/language/allocate_overflow_array_test.dart similarity index 100% rename from tests/language/vm/allocate_overflow_array_test.dart rename to runtime/tests/vm/dart/language/allocate_overflow_array_test.dart diff --git a/tests/language/vm/allocate_overflow_bytearray_test.dart b/runtime/tests/vm/dart/language/allocate_overflow_bytearray_test.dart similarity index 100% rename from tests/language/vm/allocate_overflow_bytearray_test.dart rename to runtime/tests/vm/dart/language/allocate_overflow_bytearray_test.dart diff --git a/tests/language/vm/allocate_overflow_string_test.dart b/runtime/tests/vm/dart/language/allocate_overflow_string_test.dart similarity index 100% rename from tests/language/vm/allocate_overflow_string_test.dart rename to runtime/tests/vm/dart/language/allocate_overflow_string_test.dart diff --git a/tests/language/vm/allocation_sinking_arrays_test.dart b/runtime/tests/vm/dart/language/allocation_sinking_arrays_test.dart similarity index 100% rename from tests/language/vm/allocation_sinking_arrays_test.dart rename to runtime/tests/vm/dart/language/allocation_sinking_arrays_test.dart diff --git a/tests/language/vm/allocation_sinking_vm_test.dart b/runtime/tests/vm/dart/language/allocation_sinking_vm_test.dart similarity index 100% rename from tests/language/vm/allocation_sinking_vm_test.dart rename to runtime/tests/vm/dart/language/allocation_sinking_vm_test.dart diff --git a/tests/language/vm/async_await_catch_stacktrace_test.dart b/runtime/tests/vm/dart/language/async_await_catch_stacktrace_test.dart similarity index 100% rename from tests/language/vm/async_await_catch_stacktrace_test.dart rename to runtime/tests/vm/dart/language/async_await_catch_stacktrace_test.dart diff --git a/tests/language/vm/await_synchronous_future_test.dart b/runtime/tests/vm/dart/language/await_synchronous_future_test.dart similarity index 100% rename from tests/language/vm/await_synchronous_future_test.dart rename to runtime/tests/vm/dart/language/await_synchronous_future_test.dart diff --git a/tests/language/vm/bitnot_int_test.dart b/runtime/tests/vm/dart/language/bitnot_int_test.dart similarity index 100% rename from tests/language/vm/bitnot_int_test.dart rename to runtime/tests/vm/dart/language/bitnot_int_test.dart diff --git a/tests/language/vm/bool_check_stack_traces_test.dart b/runtime/tests/vm/dart/language/bool_check_stack_traces_test.dart similarity index 100% rename from tests/language/vm/bool_check_stack_traces_test.dart rename to runtime/tests/vm/dart/language/bool_check_stack_traces_test.dart diff --git a/tests/language/vm/canonicalization_preserves_deopt_test.dart b/runtime/tests/vm/dart/language/canonicalization_preserves_deopt_test.dart similarity index 100% rename from tests/language/vm/canonicalization_preserves_deopt_test.dart rename to runtime/tests/vm/dart/language/canonicalization_preserves_deopt_test.dart diff --git a/tests/language/vm/checked_smi_comparison_test.dart b/runtime/tests/vm/dart/language/checked_smi_comparison_test.dart similarity index 100% rename from tests/language/vm/checked_smi_comparison_test.dart rename to runtime/tests/vm/dart/language/checked_smi_comparison_test.dart diff --git a/tests/language/vm/checked_smi_op_test.dart b/runtime/tests/vm/dart/language/checked_smi_op_test.dart similarity index 100% rename from tests/language/vm/checked_smi_op_test.dart rename to runtime/tests/vm/dart/language/checked_smi_op_test.dart diff --git a/tests/language/vm/clamp_37868_test.dart b/runtime/tests/vm/dart/language/clamp_37868_test.dart similarity index 100% rename from tests/language/vm/clamp_37868_test.dart rename to runtime/tests/vm/dart/language/clamp_37868_test.dart diff --git a/tests/language/vm/closure_memory_retention_test.dart b/runtime/tests/vm/dart/language/closure_memory_retention_test.dart similarity index 100% rename from tests/language/vm/closure_memory_retention_test.dart rename to runtime/tests/vm/dart/language/closure_memory_retention_test.dart diff --git a/tests/language/vm/create_array_instr_deopt2_test.dart b/runtime/tests/vm/dart/language/create_array_instr_deopt2_test.dart similarity index 100% rename from tests/language/vm/create_array_instr_deopt2_test.dart rename to runtime/tests/vm/dart/language/create_array_instr_deopt2_test.dart diff --git a/tests/language/vm/create_array_instr_deopt_test.dart b/runtime/tests/vm/dart/language/create_array_instr_deopt_test.dart similarity index 100% rename from tests/language/vm/create_array_instr_deopt_test.dart rename to runtime/tests/vm/dart/language/create_array_instr_deopt_test.dart diff --git a/tests/language/vm/deep_loop_test.dart b/runtime/tests/vm/dart/language/deep_loop_test.dart similarity index 100% rename from tests/language/vm/deep_loop_test.dart rename to runtime/tests/vm/dart/language/deep_loop_test.dart diff --git a/tests/language/vm/deopt_during_field_init_test.dart b/runtime/tests/vm/dart/language/deopt_during_field_init_test.dart similarity index 100% rename from tests/language/vm/deopt_during_field_init_test.dart rename to runtime/tests/vm/dart/language/deopt_during_field_init_test.dart diff --git a/tests/language/vm/deopt_hoisted_smi_check_vm_test.dart b/runtime/tests/vm/dart/language/deopt_hoisted_smi_check_vm_test.dart similarity index 100% rename from tests/language/vm/deopt_hoisted_smi_check_vm_test.dart rename to runtime/tests/vm/dart/language/deopt_hoisted_smi_check_vm_test.dart diff --git a/tests/language/vm/deopt_smi_check_vm_test.dart b/runtime/tests/vm/dart/language/deopt_smi_check_vm_test.dart similarity index 100% rename from tests/language/vm/deopt_smi_check_vm_test.dart rename to runtime/tests/vm/dart/language/deopt_smi_check_vm_test.dart diff --git a/tests/language/vm/div_mod_test.dart b/runtime/tests/vm/dart/language/div_mod_test.dart similarity index 100% rename from tests/language/vm/div_mod_test.dart rename to runtime/tests/vm/dart/language/div_mod_test.dart diff --git a/tests/language/vm/exactness/future_or_regression_34238_test.dart b/runtime/tests/vm/dart/language/exactness/future_or_regression_34238_test.dart similarity index 100% rename from tests/language/vm/exactness/future_or_regression_34238_test.dart rename to runtime/tests/vm/dart/language/exactness/future_or_regression_34238_test.dart diff --git a/tests/language/vm/function_equality_vm_test.dart b/runtime/tests/vm/dart/language/function_equality_vm_test.dart similarity index 100% rename from tests/language/vm/function_equality_vm_test.dart rename to runtime/tests/vm/dart/language/function_equality_vm_test.dart diff --git a/tests/language/vm/fuzzer_unsigned_shift_right_test.dart b/runtime/tests/vm/dart/language/fuzzer_unsigned_shift_right_test.dart similarity index 100% rename from tests/language/vm/fuzzer_unsigned_shift_right_test.dart rename to runtime/tests/vm/dart/language/fuzzer_unsigned_shift_right_test.dart diff --git a/tests/language/vm/if_conversion_vm_test.dart b/runtime/tests/vm/dart/language/if_conversion_vm_test.dart similarity index 100% rename from tests/language/vm/if_conversion_vm_test.dart rename to runtime/tests/vm/dart/language/if_conversion_vm_test.dart diff --git a/tests/language/vm/inline_heuristic_test.dart b/runtime/tests/vm/dart/language/inline_heuristic_test.dart similarity index 100% rename from tests/language/vm/inline_heuristic_test.dart rename to runtime/tests/vm/dart/language/inline_heuristic_test.dart diff --git a/tests/language/vm/integer_type_propagation2_test.dart b/runtime/tests/vm/dart/language/integer_type_propagation2_test.dart similarity index 100% rename from tests/language/vm/integer_type_propagation2_test.dart rename to runtime/tests/vm/dart/language/integer_type_propagation2_test.dart diff --git a/tests/language/vm/integer_type_propagation_test.dart b/runtime/tests/vm/dart/language/integer_type_propagation_test.dart similarity index 100% rename from tests/language/vm/integer_type_propagation_test.dart rename to runtime/tests/vm/dart/language/integer_type_propagation_test.dart diff --git a/tests/language/vm/irreducible_loop_test.dart b/runtime/tests/vm/dart/language/irreducible_loop_test.dart similarity index 100% rename from tests/language/vm/irreducible_loop_test.dart rename to runtime/tests/vm/dart/language/irreducible_loop_test.dart diff --git a/tests/language/vm/issue11087_vm_test.dart b/runtime/tests/vm/dart/language/issue11087_vm_test.dart similarity index 100% rename from tests/language/vm/issue11087_vm_test.dart rename to runtime/tests/vm/dart/language/issue11087_vm_test.dart diff --git a/tests/language/vm/issue21220_vm_test.dart b/runtime/tests/vm/dart/language/issue21220_vm_test.dart similarity index 100% rename from tests/language/vm/issue21220_vm_test.dart rename to runtime/tests/vm/dart/language/issue21220_vm_test.dart diff --git a/tests/language/vm/lazy_async_exception_stack2_test.dart b/runtime/tests/vm/dart/language/lazy_async_exception_stack2_test.dart similarity index 100% rename from tests/language/vm/lazy_async_exception_stack2_test.dart rename to runtime/tests/vm/dart/language/lazy_async_exception_stack2_test.dart diff --git a/tests/language/vm/lazy_async_exception_stack_helper.dart b/runtime/tests/vm/dart/language/lazy_async_exception_stack_helper.dart similarity index 100% rename from tests/language/vm/lazy_async_exception_stack_helper.dart rename to runtime/tests/vm/dart/language/lazy_async_exception_stack_helper.dart diff --git a/tests/language/vm/lazy_async_exception_stack_test.dart b/runtime/tests/vm/dart/language/lazy_async_exception_stack_test.dart similarity index 100% rename from tests/language/vm/lazy_async_exception_stack_test.dart rename to runtime/tests/vm/dart/language/lazy_async_exception_stack_test.dart diff --git a/tests/language/vm/lazy_deopt_vm_test.dart b/runtime/tests/vm/dart/language/lazy_deopt_vm_test.dart similarity index 100% rename from tests/language/vm/lazy_deopt_vm_test.dart rename to runtime/tests/vm/dart/language/lazy_deopt_vm_test.dart diff --git a/tests/language/vm/lazy_deopt_with_exception_and_stacktrace_test.dart b/runtime/tests/vm/dart/language/lazy_deopt_with_exception_and_stacktrace_test.dart similarity index 100% rename from tests/language/vm/lazy_deopt_with_exception_and_stacktrace_test.dart rename to runtime/tests/vm/dart/language/lazy_deopt_with_exception_and_stacktrace_test.dart diff --git a/tests/language/vm/lazy_deopt_with_exception_concurrent_test.dart b/runtime/tests/vm/dart/language/lazy_deopt_with_exception_concurrent_test.dart similarity index 100% rename from tests/language/vm/lazy_deopt_with_exception_concurrent_test.dart rename to runtime/tests/vm/dart/language/lazy_deopt_with_exception_concurrent_test.dart diff --git a/tests/language/vm/lazy_deopt_with_exception_test.dart b/runtime/tests/vm/dart/language/lazy_deopt_with_exception_test.dart similarity index 100% rename from tests/language/vm/lazy_deopt_with_exception_test.dart rename to runtime/tests/vm/dart/language/lazy_deopt_with_exception_test.dart diff --git a/tests/language/vm/licm_constant_redefinition_vm_test.dart b/runtime/tests/vm/dart/language/licm_constant_redefinition_vm_test.dart similarity index 100% rename from tests/language/vm/licm_constant_redefinition_vm_test.dart rename to runtime/tests/vm/dart/language/licm_constant_redefinition_vm_test.dart diff --git a/tests/language/vm/load_elimination_any_use_creates_alias_test.dart b/runtime/tests/vm/dart/language/load_elimination_any_use_creates_alias_test.dart similarity index 100% rename from tests/language/vm/load_elimination_any_use_creates_alias_test.dart rename to runtime/tests/vm/dart/language/load_elimination_any_use_creates_alias_test.dart diff --git a/tests/language/vm/load_elimination_has_loads_from_place_test.dart b/runtime/tests/vm/dart/language/load_elimination_has_loads_from_place_test.dart similarity index 100% rename from tests/language/vm/load_elimination_has_loads_from_place_test.dart rename to runtime/tests/vm/dart/language/load_elimination_has_loads_from_place_test.dart diff --git a/tests/language/vm/load_elimination_mark_stored_values_escaping_test.dart b/runtime/tests/vm/dart/language/load_elimination_mark_stored_values_escaping_test.dart similarity index 100% rename from tests/language/vm/load_elimination_mark_stored_values_escaping_test.dart rename to runtime/tests/vm/dart/language/load_elimination_mark_stored_values_escaping_test.dart diff --git a/tests/language/vm/load_elimination_two_redefinitions_test.dart b/runtime/tests/vm/dart/language/load_elimination_two_redefinitions_test.dart similarity index 100% rename from tests/language/vm/load_elimination_two_redefinitions_test.dart rename to runtime/tests/vm/dart/language/load_elimination_two_redefinitions_test.dart diff --git a/tests/language/vm/load_to_load_forwarding_cutdown_vm_test.dart b/runtime/tests/vm/dart/language/load_to_load_forwarding_cutdown_vm_test.dart similarity index 100% rename from tests/language/vm/load_to_load_forwarding_cutdown_vm_test.dart rename to runtime/tests/vm/dart/language/load_to_load_forwarding_cutdown_vm_test.dart diff --git a/tests/language/vm/load_to_load_forwarding_vm_test.dart b/runtime/tests/vm/dart/language/load_to_load_forwarding_vm_test.dart similarity index 100% rename from tests/language/vm/load_to_load_forwarding_vm_test.dart rename to runtime/tests/vm/dart/language/load_to_load_forwarding_vm_test.dart diff --git a/tests/language/vm/load_to_load_unaligned_forwarding_vm_test.dart b/runtime/tests/vm/dart/language/load_to_load_unaligned_forwarding_vm_test.dart similarity index 100% rename from tests/language/vm/load_to_load_unaligned_forwarding_vm_test.dart rename to runtime/tests/vm/dart/language/load_to_load_unaligned_forwarding_vm_test.dart diff --git a/tests/language/vm/math_vm_test.dart b/runtime/tests/vm/dart/language/math_vm_test.dart similarity index 100% rename from tests/language/vm/math_vm_test.dart rename to runtime/tests/vm/dart/language/math_vm_test.dart diff --git a/tests/language/vm/mixin_test.dart b/runtime/tests/vm/dart/language/mixin_test.dart similarity index 100% rename from tests/language/vm/mixin_test.dart rename to runtime/tests/vm/dart/language/mixin_test.dart diff --git a/tests/language/vm/modtruncdiv_int_test.dart b/runtime/tests/vm/dart/language/modtruncdiv_int_test.dart similarity index 100% rename from tests/language/vm/modtruncdiv_int_test.dart rename to runtime/tests/vm/dart/language/modtruncdiv_int_test.dart diff --git a/tests/language/vm/mult_int_test.dart b/runtime/tests/vm/dart/language/mult_int_test.dart similarity index 100% rename from tests/language/vm/mult_int_test.dart rename to runtime/tests/vm/dart/language/mult_int_test.dart diff --git a/tests/language/vm/negate_int_test.dart b/runtime/tests/vm/dart/language/negate_int_test.dart similarity index 100% rename from tests/language/vm/negate_int_test.dart rename to runtime/tests/vm/dart/language/negate_int_test.dart diff --git a/tests/language/vm/no_such_args_error_message_vm_test.dart b/runtime/tests/vm/dart/language/no_such_args_error_message_vm_test.dart similarity index 100% rename from tests/language/vm/no_such_args_error_message_vm_test.dart rename to runtime/tests/vm/dart/language/no_such_args_error_message_vm_test.dart diff --git a/tests/language/vm/no_such_method_error_message_callable_vm_test.dart b/runtime/tests/vm/dart/language/no_such_method_error_message_callable_vm_test.dart similarity index 100% rename from tests/language/vm/no_such_method_error_message_callable_vm_test.dart rename to runtime/tests/vm/dart/language/no_such_method_error_message_callable_vm_test.dart diff --git a/tests/language/vm/no_such_method_error_message_vm_test.dart b/runtime/tests/vm/dart/language/no_such_method_error_message_vm_test.dart similarity index 100% rename from tests/language/vm/no_such_method_error_message_vm_test.dart rename to runtime/tests/vm/dart/language/no_such_method_error_message_vm_test.dart diff --git a/tests/language/vm/null_hashcode_optimized_vm_test.dart b/runtime/tests/vm/dart/language/null_hashcode_optimized_vm_test.dart similarity index 100% rename from tests/language/vm/null_hashcode_optimized_vm_test.dart rename to runtime/tests/vm/dart/language/null_hashcode_optimized_vm_test.dart diff --git a/tests/language/vm/optimization_test.dart b/runtime/tests/vm/dart/language/optimization_test.dart similarity index 100% rename from tests/language/vm/optimization_test.dart rename to runtime/tests/vm/dart/language/optimization_test.dart diff --git a/tests/language/vm/optimized_await_regress_test.dart b/runtime/tests/vm/dart/language/optimized_await_regress_test.dart similarity index 100% rename from tests/language/vm/optimized_await_regress_test.dart rename to runtime/tests/vm/dart/language/optimized_await_regress_test.dart diff --git a/tests/language/vm/optimized_check_class_test.dart b/runtime/tests/vm/dart/language/optimized_check_class_test.dart similarity index 100% rename from tests/language/vm/optimized_check_class_test.dart rename to runtime/tests/vm/dart/language/optimized_check_class_test.dart diff --git a/tests/language/vm/optimized_guarded_field_isolates_test.dart b/runtime/tests/vm/dart/language/optimized_guarded_field_isolates_test.dart similarity index 100% rename from tests/language/vm/optimized_guarded_field_isolates_test.dart rename to runtime/tests/vm/dart/language/optimized_guarded_field_isolates_test.dart diff --git a/tests/language/vm/optimized_guarded_field_test.dart b/runtime/tests/vm/dart/language/optimized_guarded_field_test.dart similarity index 100% rename from tests/language/vm/optimized_guarded_field_test.dart rename to runtime/tests/vm/dart/language/optimized_guarded_field_test.dart diff --git a/tests/language/vm/optimized_identical_test.dart b/runtime/tests/vm/dart/language/optimized_identical_test.dart similarity index 100% rename from tests/language/vm/optimized_identical_test.dart rename to runtime/tests/vm/dart/language/optimized_identical_test.dart diff --git a/tests/language/vm/optimized_list_constructor_test.dart b/runtime/tests/vm/dart/language/optimized_list_constructor_test.dart similarity index 100% rename from tests/language/vm/optimized_list_constructor_test.dart rename to runtime/tests/vm/dart/language/optimized_list_constructor_test.dart diff --git a/tests/language/vm/optimized_polymorphic_list_access_test.dart b/runtime/tests/vm/dart/language/optimized_polymorphic_list_access_test.dart similarity index 100% rename from tests/language/vm/optimized_polymorphic_list_access_test.dart rename to runtime/tests/vm/dart/language/optimized_polymorphic_list_access_test.dart diff --git a/tests/language/vm/optimized_shl_test.dart b/runtime/tests/vm/dart/language/optimized_shl_test.dart similarity index 100% rename from tests/language/vm/optimized_shl_test.dart rename to runtime/tests/vm/dart/language/optimized_shl_test.dart diff --git a/tests/language/vm/optimized_stacktrace_test.dart b/runtime/tests/vm/dart/language/optimized_stacktrace_test.dart similarity index 100% rename from tests/language/vm/optimized_stacktrace_test.dart rename to runtime/tests/vm/dart/language/optimized_stacktrace_test.dart diff --git a/tests/language/vm/optimized_testsmi_test.dart b/runtime/tests/vm/dart/language/optimized_testsmi_test.dart similarity index 100% rename from tests/language/vm/optimized_testsmi_test.dart rename to runtime/tests/vm/dart/language/optimized_testsmi_test.dart diff --git a/tests/language/vm/optimized_try_catch_cha_test.dart b/runtime/tests/vm/dart/language/optimized_try_catch_cha_test.dart similarity index 100% rename from tests/language/vm/optimized_try_catch_cha_test.dart rename to runtime/tests/vm/dart/language/optimized_try_catch_cha_test.dart diff --git a/tests/language/vm/optimized_unique_selector_test.dart b/runtime/tests/vm/dart/language/optimized_unique_selector_test.dart similarity index 100% rename from tests/language/vm/optimized_unique_selector_test.dart rename to runtime/tests/vm/dart/language/optimized_unique_selector_test.dart diff --git a/tests/language/vm/osr_nonempty_stack_test.dart b/runtime/tests/vm/dart/language/osr_nonempty_stack_test.dart similarity index 100% rename from tests/language/vm/osr_nonempty_stack_test.dart rename to runtime/tests/vm/dart/language/osr_nonempty_stack_test.dart diff --git a/tests/language/vm/plus_null_37719_test.dart b/runtime/tests/vm/dart/language/plus_null_37719_test.dart similarity index 100% rename from tests/language/vm/plus_null_37719_test.dart rename to runtime/tests/vm/dart/language/plus_null_37719_test.dart diff --git a/tests/language/vm/power_int_test.dart b/runtime/tests/vm/dart/language/power_int_test.dart similarity index 100% rename from tests/language/vm/power_int_test.dart rename to runtime/tests/vm/dart/language/power_int_test.dart diff --git a/tests/language/vm/precompiled_static_initializer_test.dart b/runtime/tests/vm/dart/language/precompiled_static_initializer_test.dart similarity index 100% rename from tests/language/vm/precompiled_static_initializer_test.dart rename to runtime/tests/vm/dart/language/precompiled_static_initializer_test.dart diff --git a/tests/language/vm/regress_14903_test.dart b/runtime/tests/vm/dart/language/regress_14903_test.dart similarity index 100% rename from tests/language/vm/regress_14903_test.dart rename to runtime/tests/vm/dart/language/regress_14903_test.dart diff --git a/tests/language/vm/regress_16873_test.dart b/runtime/tests/vm/dart/language/regress_16873_test.dart similarity index 100% rename from tests/language/vm/regress_16873_test.dart rename to runtime/tests/vm/dart/language/regress_16873_test.dart diff --git a/tests/language/vm/regress_21245_test.dart b/runtime/tests/vm/dart/language/regress_21245_test.dart similarity index 100% rename from tests/language/vm/regress_21245_test.dart rename to runtime/tests/vm/dart/language/regress_21245_test.dart diff --git a/tests/language/vm/regress_22480_test.dart b/runtime/tests/vm/dart/language/regress_22480_test.dart similarity index 100% rename from tests/language/vm/regress_22480_test.dart rename to runtime/tests/vm/dart/language/regress_22480_test.dart diff --git a/tests/language/vm/regress_22541_vm_test.dart b/runtime/tests/vm/dart/language/regress_22541_vm_test.dart similarity index 100% rename from tests/language/vm/regress_22541_vm_test.dart rename to runtime/tests/vm/dart/language/regress_22541_vm_test.dart diff --git a/tests/language/vm/regress_22621_vm_test.dart b/runtime/tests/vm/dart/language/regress_22621_vm_test.dart similarity index 100% rename from tests/language/vm/regress_22621_vm_test.dart rename to runtime/tests/vm/dart/language/regress_22621_vm_test.dart diff --git a/tests/language/vm/regress_22693_vm_test.dart b/runtime/tests/vm/dart/language/regress_22693_vm_test.dart similarity index 100% rename from tests/language/vm/regress_22693_vm_test.dart rename to runtime/tests/vm/dart/language/regress_22693_vm_test.dart diff --git a/tests/language/vm/regress_23117_vm_test.dart b/runtime/tests/vm/dart/language/regress_23117_vm_test.dart similarity index 100% rename from tests/language/vm/regress_23117_vm_test.dart rename to runtime/tests/vm/dart/language/regress_23117_vm_test.dart diff --git a/tests/language/vm/regress_23238_test.dart b/runtime/tests/vm/dart/language/regress_23238_test.dart similarity index 100% rename from tests/language/vm/regress_23238_test.dart rename to runtime/tests/vm/dart/language/regress_23238_test.dart diff --git a/tests/language/vm/regress_24517_test.dart b/runtime/tests/vm/dart/language/regress_24517_test.dart similarity index 100% rename from tests/language/vm/regress_24517_test.dart rename to runtime/tests/vm/dart/language/regress_24517_test.dart diff --git a/tests/language/vm/regress_27671_other.dart b/runtime/tests/vm/dart/language/regress_27671_other.dart similarity index 100% rename from tests/language/vm/regress_27671_other.dart rename to runtime/tests/vm/dart/language/regress_27671_other.dart diff --git a/tests/language/vm/regress_27671_test.dart b/runtime/tests/vm/dart/language/regress_27671_test.dart similarity index 100% rename from tests/language/vm/regress_27671_test.dart rename to runtime/tests/vm/dart/language/regress_27671_test.dart diff --git a/tests/language/vm/regress_29137_vm_test.dart b/runtime/tests/vm/dart/language/regress_29137_vm_test.dart similarity index 100% rename from tests/language/vm/regress_29137_vm_test.dart rename to runtime/tests/vm/dart/language/regress_29137_vm_test.dart diff --git a/tests/language/vm/regress_29145_test.dart b/runtime/tests/vm/dart/language/regress_29145_test.dart similarity index 100% rename from tests/language/vm/regress_29145_test.dart rename to runtime/tests/vm/dart/language/regress_29145_test.dart diff --git a/tests/language/vm/regress_31946_test.dart b/runtime/tests/vm/dart/language/regress_31946_test.dart similarity index 100% rename from tests/language/vm/regress_31946_test.dart rename to runtime/tests/vm/dart/language/regress_31946_test.dart diff --git a/tests/language/vm/regress_32204_test.dart b/runtime/tests/vm/dart/language/regress_32204_test.dart similarity index 100% rename from tests/language/vm/regress_32204_test.dart rename to runtime/tests/vm/dart/language/regress_32204_test.dart diff --git a/tests/language/vm/regress_32322_test.dart b/runtime/tests/vm/dart/language/regress_32322_test.dart similarity index 100% rename from tests/language/vm/regress_32322_test.dart rename to runtime/tests/vm/dart/language/regress_32322_test.dart diff --git a/tests/language/vm/regress_32502_test.dart b/runtime/tests/vm/dart/language/regress_32502_test.dart similarity index 100% rename from tests/language/vm/regress_32502_test.dart rename to runtime/tests/vm/dart/language/regress_32502_test.dart diff --git a/tests/language/vm/regress_32971_legacy_test.dart b/runtime/tests/vm/dart/language/regress_32971_legacy_test.dart similarity index 100% rename from tests/language/vm/regress_32971_legacy_test.dart rename to runtime/tests/vm/dart/language/regress_32971_legacy_test.dart diff --git a/tests/language/vm/regress_32971_test.dart b/runtime/tests/vm/dart/language/regress_32971_test.dart similarity index 100% rename from tests/language/vm/regress_32971_test.dart rename to runtime/tests/vm/dart/language/regress_32971_test.dart diff --git a/tests/language/vm/regress_33025_test.dart b/runtime/tests/vm/dart/language/regress_33025_test.dart similarity index 100% rename from tests/language/vm/regress_33025_test.dart rename to runtime/tests/vm/dart/language/regress_33025_test.dart diff --git a/tests/language/vm/regress_33040_instantiation_legacy_test.dart b/runtime/tests/vm/dart/language/regress_33040_instantiation_legacy_test.dart similarity index 100% rename from tests/language/vm/regress_33040_instantiation_legacy_test.dart rename to runtime/tests/vm/dart/language/regress_33040_instantiation_legacy_test.dart diff --git a/tests/language/vm/regress_33040_instantiation_test.dart b/runtime/tests/vm/dart/language/regress_33040_instantiation_test.dart similarity index 100% rename from tests/language/vm/regress_33040_instantiation_test.dart rename to runtime/tests/vm/dart/language/regress_33040_instantiation_test.dart diff --git a/tests/language/vm/regress_33040_test.dart b/runtime/tests/vm/dart/language/regress_33040_test.dart similarity index 100% rename from tests/language/vm/regress_33040_test.dart rename to runtime/tests/vm/dart/language/regress_33040_test.dart diff --git a/tests/language/vm/regress_33073_test.dart b/runtime/tests/vm/dart/language/regress_33073_test.dart similarity index 100% rename from tests/language/vm/regress_33073_test.dart rename to runtime/tests/vm/dart/language/regress_33073_test.dart diff --git a/tests/language/vm/regress_33095_test.dart b/runtime/tests/vm/dart/language/regress_33095_test.dart similarity index 100% rename from tests/language/vm/regress_33095_test.dart rename to runtime/tests/vm/dart/language/regress_33095_test.dart diff --git a/tests/language/vm/regress_33469_test.dart b/runtime/tests/vm/dart/language/regress_33469_test.dart similarity index 100% rename from tests/language/vm/regress_33469_test.dart rename to runtime/tests/vm/dart/language/regress_33469_test.dart diff --git a/tests/language/vm/regress_33794_test.dart b/runtime/tests/vm/dart/language/regress_33794_test.dart similarity index 100% rename from tests/language/vm/regress_33794_test.dart rename to runtime/tests/vm/dart/language/regress_33794_test.dart diff --git a/tests/language/vm/regress_34051_test.dart b/runtime/tests/vm/dart/language/regress_34051_test.dart similarity index 100% rename from tests/language/vm/regress_34051_test.dart rename to runtime/tests/vm/dart/language/regress_34051_test.dart diff --git a/tests/language/vm/regress_34288_test.dart b/runtime/tests/vm/dart/language/regress_34288_test.dart similarity index 100% rename from tests/language/vm/regress_34288_test.dart rename to runtime/tests/vm/dart/language/regress_34288_test.dart diff --git a/tests/language/vm/regress_34396_helper.dart b/runtime/tests/vm/dart/language/regress_34396_helper.dart similarity index 100% rename from tests/language/vm/regress_34396_helper.dart rename to runtime/tests/vm/dart/language/regress_34396_helper.dart diff --git a/tests/language/vm/regress_34396_test.dart b/runtime/tests/vm/dart/language/regress_34396_test.dart similarity index 100% rename from tests/language/vm/regress_34396_test.dart rename to runtime/tests/vm/dart/language/regress_34396_test.dart diff --git a/tests/language/vm/regress_34435_test.dart b/runtime/tests/vm/dart/language/regress_34435_test.dart similarity index 100% rename from tests/language/vm/regress_34435_test.dart rename to runtime/tests/vm/dart/language/regress_34435_test.dart diff --git a/tests/language/vm/regress_34466_test.dart b/runtime/tests/vm/dart/language/regress_34466_test.dart similarity index 100% rename from tests/language/vm/regress_34466_test.dart rename to runtime/tests/vm/dart/language/regress_34466_test.dart diff --git a/tests/language/vm/regress_34644_test.dart b/runtime/tests/vm/dart/language/regress_34644_test.dart similarity index 100% rename from tests/language/vm/regress_34644_test.dart rename to runtime/tests/vm/dart/language/regress_34644_test.dart diff --git a/tests/language/vm/regress_34684_test.dart b/runtime/tests/vm/dart/language/regress_34684_test.dart similarity index 100% rename from tests/language/vm/regress_34684_test.dart rename to runtime/tests/vm/dart/language/regress_34684_test.dart diff --git a/tests/language/vm/regress_35321_test.dart b/runtime/tests/vm/dart/language/regress_35321_test.dart similarity index 100% rename from tests/language/vm/regress_35321_test.dart rename to runtime/tests/vm/dart/language/regress_35321_test.dart diff --git a/tests/language/vm/regress_35325_test.dart b/runtime/tests/vm/dart/language/regress_35325_test.dart similarity index 100% rename from tests/language/vm/regress_35325_test.dart rename to runtime/tests/vm/dart/language/regress_35325_test.dart diff --git a/tests/language/vm/regress_36589_test.dart b/runtime/tests/vm/dart/language/regress_36589_test.dart similarity index 100% rename from tests/language/vm/regress_36589_test.dart rename to runtime/tests/vm/dart/language/regress_36589_test.dart diff --git a/tests/language/vm/regress_36681_test.dart b/runtime/tests/vm/dart/language/regress_36681_test.dart similarity index 100% rename from tests/language/vm/regress_36681_test.dart rename to runtime/tests/vm/dart/language/regress_36681_test.dart diff --git a/tests/language/vm/regress_36778_test.dart b/runtime/tests/vm/dart/language/regress_36778_test.dart similarity index 100% rename from tests/language/vm/regress_36778_test.dart rename to runtime/tests/vm/dart/language/regress_36778_test.dart diff --git a/tests/language/vm/regress_36803_test.dart b/runtime/tests/vm/dart/language/regress_36803_test.dart similarity index 100% rename from tests/language/vm/regress_36803_test.dart rename to runtime/tests/vm/dart/language/regress_36803_test.dart diff --git a/tests/language/vm/regress_37149_test.dart b/runtime/tests/vm/dart/language/regress_37149_test.dart similarity index 100% rename from tests/language/vm/regress_37149_test.dart rename to runtime/tests/vm/dart/language/regress_37149_test.dart diff --git a/tests/language/vm/regress_37984_test.dart b/runtime/tests/vm/dart/language/regress_37984_test.dart similarity index 100% rename from tests/language/vm/regress_37984_test.dart rename to runtime/tests/vm/dart/language/regress_37984_test.dart diff --git a/tests/language/vm/regress_39283_test.dart b/runtime/tests/vm/dart/language/regress_39283_test.dart similarity index 100% rename from tests/language/vm/regress_39283_test.dart rename to runtime/tests/vm/dart/language/regress_39283_test.dart diff --git a/tests/language/vm/regress_40792_test.dart b/runtime/tests/vm/dart/language/regress_40792_test.dart similarity index 100% rename from tests/language/vm/regress_40792_test.dart rename to runtime/tests/vm/dart/language/regress_40792_test.dart diff --git a/tests/language/vm/regress_45260_test.dart b/runtime/tests/vm/dart/language/regress_45260_test.dart similarity index 100% rename from tests/language/vm/regress_45260_test.dart rename to runtime/tests/vm/dart/language/regress_45260_test.dart diff --git a/tests/language/vm/regress_45524_test.dart b/runtime/tests/vm/dart/language/regress_45524_test.dart similarity index 100% rename from tests/language/vm/regress_45524_test.dart rename to runtime/tests/vm/dart/language/regress_45524_test.dart diff --git a/tests/language/vm/regress_45525_test.dart b/runtime/tests/vm/dart/language/regress_45525_test.dart similarity index 100% rename from tests/language/vm/regress_45525_test.dart rename to runtime/tests/vm/dart/language/regress_45525_test.dart diff --git a/tests/language/vm/regress_45674_test.dart b/runtime/tests/vm/dart/language/regress_45674_test.dart similarity index 100% rename from tests/language/vm/regress_45674_test.dart rename to runtime/tests/vm/dart/language/regress_45674_test.dart diff --git a/tests/language/vm/regress_45855_test.dart b/runtime/tests/vm/dart/language/regress_45855_test.dart similarity index 100% rename from tests/language/vm/regress_45855_test.dart rename to runtime/tests/vm/dart/language/regress_45855_test.dart diff --git a/tests/language/vm/regress_49005_test.dart b/runtime/tests/vm/dart/language/regress_49005_test.dart similarity index 100% rename from tests/language/vm/regress_49005_test.dart rename to runtime/tests/vm/dart/language/regress_49005_test.dart diff --git a/tests/language/vm/regress_b131091988_test.dart b/runtime/tests/vm/dart/language/regress_b131091988_test.dart similarity index 100% rename from tests/language/vm/regress_b131091988_test.dart rename to runtime/tests/vm/dart/language/regress_b131091988_test.dart diff --git a/tests/language/vm/regress_b80154489_test.dart b/runtime/tests/vm/dart/language/regress_b80154489_test.dart similarity index 100% rename from tests/language/vm/regress_b80154489_test.dart rename to runtime/tests/vm/dart/language/regress_b80154489_test.dart diff --git a/tests/language/vm/regress_flutter_14891_test.dart b/runtime/tests/vm/dart/language/regress_flutter_14891_test.dart similarity index 100% rename from tests/language/vm/regress_flutter_14891_test.dart rename to runtime/tests/vm/dart/language/regress_flutter_14891_test.dart diff --git a/tests/language/vm/regress_flutter_19612_test.dart b/runtime/tests/vm/dart/language/regress_flutter_19612_test.dart similarity index 100% rename from tests/language/vm/regress_flutter_19612_test.dart rename to runtime/tests/vm/dart/language/regress_flutter_19612_test.dart diff --git a/tests/language/vm/regress_flutter_21957_test.dart b/runtime/tests/vm/dart/language/regress_flutter_21957_test.dart similarity index 100% rename from tests/language/vm/regress_flutter_21957_test.dart rename to runtime/tests/vm/dart/language/regress_flutter_21957_test.dart diff --git a/tests/language/vm/regress_flutter_22131_test.dart b/runtime/tests/vm/dart/language/regress_flutter_22131_test.dart similarity index 100% rename from tests/language/vm/regress_flutter_22131_test.dart rename to runtime/tests/vm/dart/language/regress_flutter_22131_test.dart diff --git a/tests/language/vm/regress_flutter_23879_test.dart b/runtime/tests/vm/dart/language/regress_flutter_23879_test.dart similarity index 100% rename from tests/language/vm/regress_flutter_23879_test.dart rename to runtime/tests/vm/dart/language/regress_flutter_23879_test.dart diff --git a/tests/language/vm/regress_flutter_28260_test.dart b/runtime/tests/vm/dart/language/regress_flutter_28260_test.dart similarity index 100% rename from tests/language/vm/regress_flutter_28260_test.dart rename to runtime/tests/vm/dart/language/regress_flutter_28260_test.dart diff --git a/tests/language/vm/regress_flutter_42845_lib.dart b/runtime/tests/vm/dart/language/regress_flutter_42845_lib.dart similarity index 100% rename from tests/language/vm/regress_flutter_42845_lib.dart rename to runtime/tests/vm/dart/language/regress_flutter_42845_lib.dart diff --git a/tests/language/vm/regress_flutter_42845_test.dart b/runtime/tests/vm/dart/language/regress_flutter_42845_test.dart similarity index 100% rename from tests/language/vm/regress_flutter_42845_test.dart rename to runtime/tests/vm/dart/language/regress_flutter_42845_test.dart diff --git a/tests/language/vm/regress_flutter_51828_bug2_test.dart b/runtime/tests/vm/dart/language/regress_flutter_51828_bug2_test.dart similarity index 100% rename from tests/language/vm/regress_flutter_51828_bug2_test.dart rename to runtime/tests/vm/dart/language/regress_flutter_51828_bug2_test.dart diff --git a/tests/language/vm/regress_flutter_56479_test.dart b/runtime/tests/vm/dart/language/regress_flutter_56479_test.dart similarity index 100% rename from tests/language/vm/regress_flutter_56479_test.dart rename to runtime/tests/vm/dart/language/regress_flutter_56479_test.dart diff --git a/tests/language/vm/regress_flutter_85311_test.dart b/runtime/tests/vm/dart/language/regress_flutter_85311_test.dart similarity index 100% rename from tests/language/vm/regress_flutter_85311_test.dart rename to runtime/tests/vm/dart/language/regress_flutter_85311_test.dart diff --git a/tests/language/vm/regress_flutter_89584_test.dart b/runtime/tests/vm/dart/language/regress_flutter_89584_test.dart similarity index 100% rename from tests/language/vm/regress_flutter_89584_test.dart rename to runtime/tests/vm/dart/language/regress_flutter_89584_test.dart diff --git a/tests/language/vm/regress_licm_test.dart b/runtime/tests/vm/dart/language/regress_licm_test.dart similarity index 100% rename from tests/language/vm/regress_licm_test.dart rename to runtime/tests/vm/dart/language/regress_licm_test.dart diff --git a/tests/language/vm/regress_protobuf_95_test.dart b/runtime/tests/vm/dart/language/regress_protobuf_95_test.dart similarity index 100% rename from tests/language/vm/regress_protobuf_95_test.dart rename to runtime/tests/vm/dart/language/regress_protobuf_95_test.dart diff --git a/tests/language/vm/regression_32912_test.dart b/runtime/tests/vm/dart/language/regression_32912_test.dart similarity index 100% rename from tests/language/vm/regression_32912_test.dart rename to runtime/tests/vm/dart/language/regression_32912_test.dart diff --git a/tests/language/vm/regression_36076_test.dart b/runtime/tests/vm/dart/language/regression_36076_test.dart similarity index 100% rename from tests/language/vm/regression_36076_test.dart rename to runtime/tests/vm/dart/language/regression_36076_test.dart diff --git a/tests/language/vm/regression_36587_test.dart b/runtime/tests/vm/dart/language/regression_36587_test.dart similarity index 100% rename from tests/language/vm/regression_36587_test.dart rename to runtime/tests/vm/dart/language/regression_36587_test.dart diff --git a/tests/language/vm/regression_37408_test.dart b/runtime/tests/vm/dart/language/regression_37408_test.dart similarity index 100% rename from tests/language/vm/regression_37408_test.dart rename to runtime/tests/vm/dart/language/regression_37408_test.dart diff --git a/tests/language/vm/regression_37622_test.dart b/runtime/tests/vm/dart/language/regression_37622_test.dart similarity index 100% rename from tests/language/vm/regression_37622_test.dart rename to runtime/tests/vm/dart/language/regression_37622_test.dart diff --git a/tests/language/vm/regression_37633_test.dart b/runtime/tests/vm/dart/language/regression_37633_test.dart similarity index 100% rename from tests/language/vm/regression_37633_test.dart rename to runtime/tests/vm/dart/language/regression_37633_test.dart diff --git a/tests/language/vm/regression_37821_test.dart b/runtime/tests/vm/dart/language/regression_37821_test.dart similarity index 100% rename from tests/language/vm/regression_37821_test.dart rename to runtime/tests/vm/dart/language/regression_37821_test.dart diff --git a/tests/language/vm/regression_38147_test.dart b/runtime/tests/vm/dart/language/regression_38147_test.dart similarity index 100% rename from tests/language/vm/regression_38147_test.dart rename to runtime/tests/vm/dart/language/regression_38147_test.dart diff --git a/tests/language/vm/regression_38231_legacy_test.dart b/runtime/tests/vm/dart/language/regression_38231_legacy_test.dart similarity index 100% rename from tests/language/vm/regression_38231_legacy_test.dart rename to runtime/tests/vm/dart/language/regression_38231_legacy_test.dart diff --git a/tests/language/vm/regression_38231_test.dart b/runtime/tests/vm/dart/language/regression_38231_test.dart similarity index 100% rename from tests/language/vm/regression_38231_test.dart rename to runtime/tests/vm/dart/language/regression_38231_test.dart diff --git a/tests/language/vm/regression_38412_test.dart b/runtime/tests/vm/dart/language/regression_38412_test.dart similarity index 100% rename from tests/language/vm/regression_38412_test.dart rename to runtime/tests/vm/dart/language/regression_38412_test.dart diff --git a/tests/language/vm/regression_39071_test.dart b/runtime/tests/vm/dart/language/regression_39071_test.dart similarity index 100% rename from tests/language/vm/regression_39071_test.dart rename to runtime/tests/vm/dart/language/regression_39071_test.dart diff --git a/tests/language/vm/regression_39193_test.dart b/runtime/tests/vm/dart/language/regression_39193_test.dart similarity index 100% rename from tests/language/vm/regression_39193_test.dart rename to runtime/tests/vm/dart/language/regression_39193_test.dart diff --git a/tests/language/vm/reusable_boxes_test.dart b/runtime/tests/vm/dart/language/reusable_boxes_test.dart similarity index 100% rename from tests/language/vm/reusable_boxes_test.dart rename to runtime/tests/vm/dart/language/reusable_boxes_test.dart diff --git a/tests/language/vm/shift_special_cases_test.dart b/runtime/tests/vm/dart/language/shift_special_cases_test.dart similarity index 100% rename from tests/language/vm/shift_special_cases_test.dart rename to runtime/tests/vm/dart/language/shift_special_cases_test.dart diff --git a/tests/language/vm/smi_widening_test.dart b/runtime/tests/vm/dart/language/smi_widening_test.dart similarity index 100% rename from tests/language/vm/smi_widening_test.dart rename to runtime/tests/vm/dart/language/smi_widening_test.dart diff --git a/tests/language/vm/store_elimination_vm_test.dart b/runtime/tests/vm/dart/language/store_elimination_vm_test.dart similarity index 100% rename from tests/language/vm/store_elimination_vm_test.dart rename to runtime/tests/vm/dart/language/store_elimination_vm_test.dart diff --git a/tests/language/vm/store_to_load_forwarding_phis_vm_test.dart b/runtime/tests/vm/dart/language/store_to_load_forwarding_phis_vm_test.dart similarity index 100% rename from tests/language/vm/store_to_load_forwarding_phis_vm_test.dart rename to runtime/tests/vm/dart/language/store_to_load_forwarding_phis_vm_test.dart diff --git a/tests/language/vm/string_polymorphic_test.dart b/runtime/tests/vm/dart/language/string_polymorphic_test.dart similarity index 100% rename from tests/language/vm/string_polymorphic_test.dart rename to runtime/tests/vm/dart/language/string_polymorphic_test.dart diff --git a/tests/language/vm/symbols_test.dart b/runtime/tests/vm/dart/language/symbols_test.dart similarity index 100% rename from tests/language/vm/symbols_test.dart rename to runtime/tests/vm/dart/language/symbols_test.dart diff --git a/tests/language/vm/tree_shake_type_args_in_constant_test.dart b/runtime/tests/vm/dart/language/tree_shake_type_args_in_constant_test.dart similarity index 100% rename from tests/language/vm/tree_shake_type_args_in_constant_test.dart rename to runtime/tests/vm/dart/language/tree_shake_type_args_in_constant_test.dart diff --git a/tests/language/vm/type_cast_vm_test.dart b/runtime/tests/vm/dart/language/type_cast_vm_test.dart similarity index 100% rename from tests/language/vm/type_cast_vm_test.dart rename to runtime/tests/vm/dart/language/type_cast_vm_test.dart diff --git a/tests/language/vm/type_of_call_via_getter_test.dart b/runtime/tests/vm/dart/language/type_of_call_via_getter_test.dart similarity index 100% rename from tests/language/vm/type_of_call_via_getter_test.dart rename to runtime/tests/vm/dart/language/type_of_call_via_getter_test.dart diff --git a/tests/language/vm/type_propagation_test.dart b/runtime/tests/vm/dart/language/type_propagation_test.dart similarity index 100% rename from tests/language/vm/type_propagation_test.dart rename to runtime/tests/vm/dart/language/type_propagation_test.dart diff --git a/tests/language/vm/type_vm_test.dart b/runtime/tests/vm/dart/language/type_vm_test.dart similarity index 100% rename from tests/language/vm/type_vm_test.dart rename to runtime/tests/vm/dart/language/type_vm_test.dart diff --git a/tests/language/vm/uint32_add_test.dart b/runtime/tests/vm/dart/language/uint32_add_test.dart similarity index 100% rename from tests/language/vm/uint32_add_test.dart rename to runtime/tests/vm/dart/language/uint32_add_test.dart diff --git a/tests/language/vm/uint32_right_shift_test.dart b/runtime/tests/vm/dart/language/uint32_right_shift_test.dart similarity index 100% rename from tests/language/vm/uint32_right_shift_test.dart rename to runtime/tests/vm/dart/language/uint32_right_shift_test.dart diff --git a/tests/language/vm/uint32_shift_test.dart b/runtime/tests/vm/dart/language/uint32_shift_test.dart similarity index 100% rename from tests/language/vm/uint32_shift_test.dart rename to runtime/tests/vm/dart/language/uint32_shift_test.dart diff --git a/tests/language/vm/unaligned_float_access_literal_index_test.dart b/runtime/tests/vm/dart/language/unaligned_float_access_literal_index_test.dart similarity index 100% rename from tests/language/vm/unaligned_float_access_literal_index_test.dart rename to runtime/tests/vm/dart/language/unaligned_float_access_literal_index_test.dart diff --git a/tests/language/vm/unaligned_float_access_register_index_test.dart b/runtime/tests/vm/dart/language/unaligned_float_access_register_index_test.dart similarity index 100% rename from tests/language/vm/unaligned_float_access_register_index_test.dart rename to runtime/tests/vm/dart/language/unaligned_float_access_register_index_test.dart diff --git a/tests/language/vm/unaligned_integer_access_literal_index_test.dart b/runtime/tests/vm/dart/language/unaligned_integer_access_literal_index_test.dart similarity index 100% rename from tests/language/vm/unaligned_integer_access_literal_index_test.dart rename to runtime/tests/vm/dart/language/unaligned_integer_access_literal_index_test.dart diff --git a/tests/language/vm/unaligned_integer_access_register_index_test.dart b/runtime/tests/vm/dart/language/unaligned_integer_access_register_index_test.dart similarity index 100% rename from tests/language/vm/unaligned_integer_access_register_index_test.dart rename to runtime/tests/vm/dart/language/unaligned_integer_access_register_index_test.dart diff --git a/tests/language/vm/unique_selector_test.dart b/runtime/tests/vm/dart/language/unique_selector_test.dart similarity index 100% rename from tests/language/vm/unique_selector_test.dart rename to runtime/tests/vm/dart/language/unique_selector_test.dart diff --git a/tests/language/vm/unreachable_code_test.dart b/runtime/tests/vm/dart/language/unreachable_code_test.dart similarity index 100% rename from tests/language/vm/unreachable_code_test.dart rename to runtime/tests/vm/dart/language/unreachable_code_test.dart diff --git a/tests/language/vm/unregistered_closure_in_finally_test.dart b/runtime/tests/vm/dart/language/unregistered_closure_in_finally_test.dart similarity index 100% rename from tests/language/vm/unregistered_closure_in_finally_test.dart rename to runtime/tests/vm/dart/language/unregistered_closure_in_finally_test.dart diff --git a/tests/language/vm/reflect_core_vm_test.dart b/tests/lib/mirrors/reflect_core_vm_test.dart similarity index 100% rename from tests/language/vm/reflect_core_vm_test.dart rename to tests/lib/mirrors/reflect_core_vm_test.dart