diff --git a/src/test/codegen-units/item-collection/aux/cgu_export_trait_method.rs b/src/test/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs
similarity index 100%
rename from src/test/codegen-units/item-collection/aux/cgu_export_trait_method.rs
rename to src/test/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs
diff --git a/src/test/codegen-units/item-collection/aux/cgu_extern_closures.rs b/src/test/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs
similarity index 100%
rename from src/test/codegen-units/item-collection/aux/cgu_extern_closures.rs
rename to src/test/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs
diff --git a/src/test/codegen-units/item-collection/aux/cgu_generic_function.rs b/src/test/codegen-units/item-collection/auxiliary/cgu_generic_function.rs
similarity index 100%
rename from src/test/codegen-units/item-collection/aux/cgu_generic_function.rs
rename to src/test/codegen-units/item-collection/auxiliary/cgu_generic_function.rs
diff --git a/src/test/codegen-units/partitioning/aux/cgu_explicit_inlining.rs b/src/test/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs
similarity index 100%
rename from src/test/codegen-units/partitioning/aux/cgu_explicit_inlining.rs
rename to src/test/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs
diff --git a/src/test/codegen-units/partitioning/aux/cgu_extern_drop_glue.rs b/src/test/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs
similarity index 100%
rename from src/test/codegen-units/partitioning/aux/cgu_extern_drop_glue.rs
rename to src/test/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs
diff --git a/src/test/codegen-units/partitioning/aux/cgu_generic_function.rs b/src/test/codegen-units/partitioning/auxiliary/cgu_generic_function.rs
similarity index 100%
rename from src/test/codegen-units/partitioning/aux/cgu_generic_function.rs
rename to src/test/codegen-units/partitioning/auxiliary/cgu_generic_function.rs
diff --git a/src/test/compile-fail-fulldeps/aux/attr_plugin_test.rs b/src/test/compile-fail-fulldeps/auxiliary/attr_plugin_test.rs
similarity index 100%
rename from src/test/compile-fail-fulldeps/aux/attr_plugin_test.rs
rename to src/test/compile-fail-fulldeps/auxiliary/attr_plugin_test.rs
diff --git a/src/test/compile-fail-fulldeps/aux/lint_for_crate.rs b/src/test/compile-fail-fulldeps/auxiliary/lint_for_crate.rs
similarity index 100%
rename from src/test/compile-fail-fulldeps/aux/lint_for_crate.rs
rename to src/test/compile-fail-fulldeps/auxiliary/lint_for_crate.rs
diff --git a/src/test/compile-fail-fulldeps/aux/lint_group_plugin_test.rs b/src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs
similarity index 100%
rename from src/test/compile-fail-fulldeps/aux/lint_group_plugin_test.rs
rename to src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs
diff --git a/src/test/compile-fail-fulldeps/aux/lint_plugin_test.rs b/src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.rs
similarity index 100%
rename from src/test/compile-fail-fulldeps/aux/lint_plugin_test.rs
rename to src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.rs
diff --git a/src/test/compile-fail-fulldeps/aux/macro_crate_MacroRulesTT.rs b/src/test/compile-fail-fulldeps/auxiliary/macro_crate_MacroRulesTT.rs
similarity index 100%
rename from src/test/compile-fail-fulldeps/aux/macro_crate_MacroRulesTT.rs
rename to src/test/compile-fail-fulldeps/auxiliary/macro_crate_MacroRulesTT.rs
diff --git a/src/test/compile-fail-fulldeps/aux/macro_crate_test.rs b/src/test/compile-fail-fulldeps/auxiliary/macro_crate_test.rs
similarity index 100%
rename from src/test/compile-fail-fulldeps/aux/macro_crate_test.rs
rename to src/test/compile-fail-fulldeps/auxiliary/macro_crate_test.rs
diff --git a/src/test/compile-fail-fulldeps/aux/macro_reexport_1.rs b/src/test/compile-fail-fulldeps/auxiliary/macro_reexport_1.rs
similarity index 100%
rename from src/test/compile-fail-fulldeps/aux/macro_reexport_1.rs
rename to src/test/compile-fail-fulldeps/auxiliary/macro_reexport_1.rs
diff --git a/src/test/compile-fail-fulldeps/aux/rlib_crate_test.rs b/src/test/compile-fail-fulldeps/auxiliary/rlib_crate_test.rs
similarity index 100%
rename from src/test/compile-fail-fulldeps/aux/rlib_crate_test.rs
rename to src/test/compile-fail-fulldeps/auxiliary/rlib_crate_test.rs
diff --git a/src/test/compile-fail-fulldeps/aux/use_from_trait_xc.rs b/src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs
similarity index 100%
rename from src/test/compile-fail-fulldeps/aux/use_from_trait_xc.rs
rename to src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs
diff --git a/src/test/compile-fail/aux/allocator-dylib.rs b/src/test/compile-fail/auxiliary/allocator-dylib.rs
similarity index 100%
rename from src/test/compile-fail/aux/allocator-dylib.rs
rename to src/test/compile-fail/auxiliary/allocator-dylib.rs
diff --git a/src/test/compile-fail/aux/allocator-dylib2.rs b/src/test/compile-fail/auxiliary/allocator-dylib2.rs
similarity index 100%
rename from src/test/compile-fail/aux/allocator-dylib2.rs
rename to src/test/compile-fail/auxiliary/allocator-dylib2.rs
diff --git a/src/test/compile-fail/aux/allocator1.rs b/src/test/compile-fail/auxiliary/allocator1.rs
similarity index 100%
rename from src/test/compile-fail/aux/allocator1.rs
rename to src/test/compile-fail/auxiliary/allocator1.rs
diff --git a/src/test/compile-fail/aux/allocator2.rs b/src/test/compile-fail/auxiliary/allocator2.rs
similarity index 100%
rename from src/test/compile-fail/aux/allocator2.rs
rename to src/test/compile-fail/auxiliary/allocator2.rs
diff --git a/src/test/compile-fail/aux/allocator3.rs b/src/test/compile-fail/auxiliary/allocator3.rs
similarity index 100%
rename from src/test/compile-fail/aux/allocator3.rs
rename to src/test/compile-fail/auxiliary/allocator3.rs
diff --git a/src/test/compile-fail/aux/ambig_impl_2_lib.rs b/src/test/compile-fail/auxiliary/ambig_impl_2_lib.rs
similarity index 100%
rename from src/test/compile-fail/aux/ambig_impl_2_lib.rs
rename to src/test/compile-fail/auxiliary/ambig_impl_2_lib.rs
diff --git a/src/test/compile-fail/aux/cci_class.rs b/src/test/compile-fail/auxiliary/cci_class.rs
similarity index 100%
rename from src/test/compile-fail/aux/cci_class.rs
rename to src/test/compile-fail/auxiliary/cci_class.rs
diff --git a/src/test/compile-fail/aux/cci_class_5.rs b/src/test/compile-fail/auxiliary/cci_class_5.rs
similarity index 100%
rename from src/test/compile-fail/aux/cci_class_5.rs
rename to src/test/compile-fail/auxiliary/cci_class_5.rs
diff --git a/src/test/compile-fail/aux/changing-crates-a1.rs b/src/test/compile-fail/auxiliary/changing-crates-a1.rs
similarity index 100%
rename from src/test/compile-fail/aux/changing-crates-a1.rs
rename to src/test/compile-fail/auxiliary/changing-crates-a1.rs
diff --git a/src/test/compile-fail/aux/changing-crates-a2.rs b/src/test/compile-fail/auxiliary/changing-crates-a2.rs
similarity index 100%
rename from src/test/compile-fail/aux/changing-crates-a2.rs
rename to src/test/compile-fail/auxiliary/changing-crates-a2.rs
diff --git a/src/test/compile-fail/aux/changing-crates-b.rs b/src/test/compile-fail/auxiliary/changing-crates-b.rs
similarity index 100%
rename from src/test/compile-fail/aux/changing-crates-b.rs
rename to src/test/compile-fail/auxiliary/changing-crates-b.rs
diff --git a/src/test/compile-fail/aux/coherence_copy_like_lib.rs b/src/test/compile-fail/auxiliary/coherence_copy_like_lib.rs
similarity index 100%
rename from src/test/compile-fail/aux/coherence_copy_like_lib.rs
rename to src/test/compile-fail/auxiliary/coherence_copy_like_lib.rs
diff --git a/src/test/compile-fail/aux/coherence_inherent_cc_lib.rs b/src/test/compile-fail/auxiliary/coherence_inherent_cc_lib.rs
similarity index 100%
rename from src/test/compile-fail/aux/coherence_inherent_cc_lib.rs
rename to src/test/compile-fail/auxiliary/coherence_inherent_cc_lib.rs
diff --git a/src/test/compile-fail/aux/coherence_lib.rs b/src/test/compile-fail/auxiliary/coherence_lib.rs
similarity index 100%
rename from src/test/compile-fail/aux/coherence_lib.rs
rename to src/test/compile-fail/auxiliary/coherence_lib.rs
diff --git a/src/test/compile-fail/aux/coherence_orphan_lib.rs b/src/test/compile-fail/auxiliary/coherence_orphan_lib.rs
similarity index 100%
rename from src/test/compile-fail/aux/coherence_orphan_lib.rs
rename to src/test/compile-fail/auxiliary/coherence_orphan_lib.rs
diff --git a/src/test/compile-fail/aux/const_fn_lib.rs b/src/test/compile-fail/auxiliary/const_fn_lib.rs
similarity index 100%
rename from src/test/compile-fail/aux/const_fn_lib.rs
rename to src/test/compile-fail/auxiliary/const_fn_lib.rs
diff --git a/src/test/compile-fail/aux/crate_a1.rs b/src/test/compile-fail/auxiliary/crate_a1.rs
similarity index 100%
rename from src/test/compile-fail/aux/crate_a1.rs
rename to src/test/compile-fail/auxiliary/crate_a1.rs
diff --git a/src/test/compile-fail/aux/crate_a2.rs b/src/test/compile-fail/auxiliary/crate_a2.rs
similarity index 100%
rename from src/test/compile-fail/aux/crate_a2.rs
rename to src/test/compile-fail/auxiliary/crate_a2.rs
diff --git a/src/test/compile-fail/aux/crateresolve1-1.rs b/src/test/compile-fail/auxiliary/crateresolve1-1.rs
similarity index 100%
rename from src/test/compile-fail/aux/crateresolve1-1.rs
rename to src/test/compile-fail/auxiliary/crateresolve1-1.rs
diff --git a/src/test/compile-fail/aux/crateresolve1-2.rs b/src/test/compile-fail/auxiliary/crateresolve1-2.rs
similarity index 100%
rename from src/test/compile-fail/aux/crateresolve1-2.rs
rename to src/test/compile-fail/auxiliary/crateresolve1-2.rs
diff --git a/src/test/compile-fail/aux/crateresolve1-3.rs b/src/test/compile-fail/auxiliary/crateresolve1-3.rs
similarity index 100%
rename from src/test/compile-fail/aux/crateresolve1-3.rs
rename to src/test/compile-fail/auxiliary/crateresolve1-3.rs
diff --git a/src/test/compile-fail/aux/default_ty_param_cross_crate_crate.rs b/src/test/compile-fail/auxiliary/default_ty_param_cross_crate_crate.rs
similarity index 100%
rename from src/test/compile-fail/aux/default_ty_param_cross_crate_crate.rs
rename to src/test/compile-fail/auxiliary/default_ty_param_cross_crate_crate.rs
diff --git a/src/test/compile-fail/aux/deprecation-lint.rs b/src/test/compile-fail/auxiliary/deprecation-lint.rs
similarity index 100%
rename from src/test/compile-fail/aux/deprecation-lint.rs
rename to src/test/compile-fail/auxiliary/deprecation-lint.rs
diff --git a/src/test/compile-fail/aux/empty-struct.rs b/src/test/compile-fail/auxiliary/empty-struct.rs
similarity index 100%
rename from src/test/compile-fail/aux/empty-struct.rs
rename to src/test/compile-fail/auxiliary/empty-struct.rs
diff --git a/src/test/compile-fail/aux/go_trait.rs b/src/test/compile-fail/auxiliary/go_trait.rs
similarity index 100%
rename from src/test/compile-fail/aux/go_trait.rs
rename to src/test/compile-fail/auxiliary/go_trait.rs
diff --git a/src/test/compile-fail/aux/inherited_stability.rs b/src/test/compile-fail/auxiliary/inherited_stability.rs
similarity index 100%
rename from src/test/compile-fail/aux/inherited_stability.rs
rename to src/test/compile-fail/auxiliary/inherited_stability.rs
diff --git a/src/test/compile-fail/aux/internal_unstable.rs b/src/test/compile-fail/auxiliary/internal_unstable.rs
similarity index 100%
rename from src/test/compile-fail/aux/internal_unstable.rs
rename to src/test/compile-fail/auxiliary/internal_unstable.rs
diff --git a/src/test/compile-fail/aux/issue-19163.rs b/src/test/compile-fail/auxiliary/issue-19163.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue-19163.rs
rename to src/test/compile-fail/auxiliary/issue-19163.rs
diff --git a/src/test/compile-fail/aux/issue-21146-inc.rs b/src/test/compile-fail/auxiliary/issue-21146-inc.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue-21146-inc.rs
rename to src/test/compile-fail/auxiliary/issue-21146-inc.rs
diff --git a/src/test/compile-fail/aux/issue-21221-3.rs b/src/test/compile-fail/auxiliary/issue-21221-3.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue-21221-3.rs
rename to src/test/compile-fail/auxiliary/issue-21221-3.rs
diff --git a/src/test/compile-fail/aux/issue-21221-4.rs b/src/test/compile-fail/auxiliary/issue-21221-4.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue-21221-4.rs
rename to src/test/compile-fail/auxiliary/issue-21221-4.rs
diff --git a/src/test/compile-fail/aux/issue-29181.rs b/src/test/compile-fail/auxiliary/issue-29181.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue-29181.rs
rename to src/test/compile-fail/auxiliary/issue-29181.rs
diff --git a/src/test/compile-fail/aux/issue-30535.rs b/src/test/compile-fail/auxiliary/issue-30535.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue-30535.rs
rename to src/test/compile-fail/auxiliary/issue-30535.rs
diff --git a/src/test/compile-fail/aux/issue_11680.rs b/src/test/compile-fail/auxiliary/issue_11680.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue_11680.rs
rename to src/test/compile-fail/auxiliary/issue_11680.rs
diff --git a/src/test/compile-fail/aux/issue_12612_1.rs b/src/test/compile-fail/auxiliary/issue_12612_1.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue_12612_1.rs
rename to src/test/compile-fail/auxiliary/issue_12612_1.rs
diff --git a/src/test/compile-fail/aux/issue_16725.rs b/src/test/compile-fail/auxiliary/issue_16725.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue_16725.rs
rename to src/test/compile-fail/auxiliary/issue_16725.rs
diff --git a/src/test/compile-fail/aux/issue_17718_const_privacy.rs b/src/test/compile-fail/auxiliary/issue_17718_const_privacy.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue_17718_const_privacy.rs
rename to src/test/compile-fail/auxiliary/issue_17718_const_privacy.rs
diff --git a/src/test/compile-fail/aux/issue_21202.rs b/src/test/compile-fail/auxiliary/issue_21202.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue_21202.rs
rename to src/test/compile-fail/auxiliary/issue_21202.rs
diff --git a/src/test/compile-fail/aux/issue_30123_aux.rs b/src/test/compile-fail/auxiliary/issue_30123_aux.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue_30123_aux.rs
rename to src/test/compile-fail/auxiliary/issue_30123_aux.rs
diff --git a/src/test/compile-fail/aux/issue_3907.rs b/src/test/compile-fail/auxiliary/issue_3907.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue_3907.rs
rename to src/test/compile-fail/auxiliary/issue_3907.rs
diff --git a/src/test/compile-fail/aux/issue_5844_aux.rs b/src/test/compile-fail/auxiliary/issue_5844_aux.rs
similarity index 100%
rename from src/test/compile-fail/aux/issue_5844_aux.rs
rename to src/test/compile-fail/auxiliary/issue_5844_aux.rs
diff --git a/src/test/compile-fail/aux/lifetime_bound_will_change_warning_lib.rs b/src/test/compile-fail/auxiliary/lifetime_bound_will_change_warning_lib.rs
similarity index 100%
rename from src/test/compile-fail/aux/lifetime_bound_will_change_warning_lib.rs
rename to src/test/compile-fail/auxiliary/lifetime_bound_will_change_warning_lib.rs
diff --git a/src/test/compile-fail/aux/lint_output_format.rs b/src/test/compile-fail/auxiliary/lint_output_format.rs
similarity index 100%
rename from src/test/compile-fail/aux/lint_output_format.rs
rename to src/test/compile-fail/auxiliary/lint_output_format.rs
diff --git a/src/test/compile-fail/aux/lint_stability.rs b/src/test/compile-fail/auxiliary/lint_stability.rs
similarity index 100%
rename from src/test/compile-fail/aux/lint_stability.rs
rename to src/test/compile-fail/auxiliary/lint_stability.rs
diff --git a/src/test/compile-fail/aux/lint_stability_fields.rs b/src/test/compile-fail/auxiliary/lint_stability_fields.rs
similarity index 100%
rename from src/test/compile-fail/aux/lint_stability_fields.rs
rename to src/test/compile-fail/auxiliary/lint_stability_fields.rs
diff --git a/src/test/compile-fail/aux/lint_unused_extern_crate.rs b/src/test/compile-fail/auxiliary/lint_unused_extern_crate.rs
similarity index 100%
rename from src/test/compile-fail/aux/lint_unused_extern_crate.rs
rename to src/test/compile-fail/auxiliary/lint_unused_extern_crate.rs
diff --git a/src/test/compile-fail/aux/macro_crate_nonterminal.rs b/src/test/compile-fail/auxiliary/macro_crate_nonterminal.rs
similarity index 100%
rename from src/test/compile-fail/aux/macro_crate_nonterminal.rs
rename to src/test/compile-fail/auxiliary/macro_crate_nonterminal.rs
diff --git a/src/test/compile-fail/aux/macro_non_reexport_2.rs b/src/test/compile-fail/auxiliary/macro_non_reexport_2.rs
similarity index 100%
rename from src/test/compile-fail/aux/macro_non_reexport_2.rs
rename to src/test/compile-fail/auxiliary/macro_non_reexport_2.rs
diff --git a/src/test/compile-fail/aux/macro_reexport_1.rs b/src/test/compile-fail/auxiliary/macro_reexport_1.rs
similarity index 100%
rename from src/test/compile-fail/aux/macro_reexport_1.rs
rename to src/test/compile-fail/auxiliary/macro_reexport_1.rs
diff --git a/src/test/compile-fail/aux/namespaced_enums.rs b/src/test/compile-fail/auxiliary/namespaced_enums.rs
similarity index 100%
rename from src/test/compile-fail/aux/namespaced_enums.rs
rename to src/test/compile-fail/auxiliary/namespaced_enums.rs
diff --git a/src/test/compile-fail/aux/needs_allocator.rs b/src/test/compile-fail/auxiliary/needs_allocator.rs
similarity index 100%
rename from src/test/compile-fail/aux/needs_allocator.rs
rename to src/test/compile-fail/auxiliary/needs_allocator.rs
diff --git a/src/test/compile-fail/aux/no_method_suggested_traits.rs b/src/test/compile-fail/auxiliary/no_method_suggested_traits.rs
similarity index 100%
rename from src/test/compile-fail/aux/no_method_suggested_traits.rs
rename to src/test/compile-fail/auxiliary/no_method_suggested_traits.rs
diff --git a/src/test/compile-fail/aux/noexporttypelib.rs b/src/test/compile-fail/auxiliary/noexporttypelib.rs
similarity index 100%
rename from src/test/compile-fail/aux/noexporttypelib.rs
rename to src/test/compile-fail/auxiliary/noexporttypelib.rs
diff --git a/src/test/compile-fail/aux/orphan_check_diagnostics.rs b/src/test/compile-fail/auxiliary/orphan_check_diagnostics.rs
similarity index 100%
rename from src/test/compile-fail/aux/orphan_check_diagnostics.rs
rename to src/test/compile-fail/auxiliary/orphan_check_diagnostics.rs
diff --git a/src/test/compile-fail/aux/privacy_tuple_struct.rs b/src/test/compile-fail/auxiliary/privacy_tuple_struct.rs
similarity index 100%
rename from src/test/compile-fail/aux/privacy_tuple_struct.rs
rename to src/test/compile-fail/auxiliary/privacy_tuple_struct.rs
diff --git a/src/test/compile-fail/aux/private_trait_xc.rs b/src/test/compile-fail/auxiliary/private_trait_xc.rs
similarity index 100%
rename from src/test/compile-fail/aux/private_trait_xc.rs
rename to src/test/compile-fail/auxiliary/private_trait_xc.rs
diff --git a/src/test/compile-fail/aux/pub_static_array.rs b/src/test/compile-fail/auxiliary/pub_static_array.rs
similarity index 100%
rename from src/test/compile-fail/aux/pub_static_array.rs
rename to src/test/compile-fail/auxiliary/pub_static_array.rs
diff --git a/src/test/compile-fail/aux/rbmtp_cross_crate_lib.rs b/src/test/compile-fail/auxiliary/rbmtp_cross_crate_lib.rs
similarity index 100%
rename from src/test/compile-fail/aux/rbmtp_cross_crate_lib.rs
rename to src/test/compile-fail/auxiliary/rbmtp_cross_crate_lib.rs
diff --git a/src/test/compile-fail/aux/stability_attribute_issue.rs b/src/test/compile-fail/auxiliary/stability_attribute_issue.rs
similarity index 100%
rename from src/test/compile-fail/aux/stability_attribute_issue.rs
rename to src/test/compile-fail/auxiliary/stability_attribute_issue.rs
diff --git a/src/test/compile-fail/aux/stability_cfg1.rs b/src/test/compile-fail/auxiliary/stability_cfg1.rs
similarity index 100%
rename from src/test/compile-fail/aux/stability_cfg1.rs
rename to src/test/compile-fail/auxiliary/stability_cfg1.rs
diff --git a/src/test/compile-fail/aux/stability_cfg2.rs b/src/test/compile-fail/auxiliary/stability_cfg2.rs
similarity index 100%
rename from src/test/compile-fail/aux/stability_cfg2.rs
rename to src/test/compile-fail/auxiliary/stability_cfg2.rs
diff --git a/src/test/compile-fail/aux/static_priv_by_default.rs b/src/test/compile-fail/auxiliary/static_priv_by_default.rs
similarity index 100%
rename from src/test/compile-fail/aux/static_priv_by_default.rs
rename to src/test/compile-fail/auxiliary/static_priv_by_default.rs
diff --git a/src/test/compile-fail/aux/struct_field_privacy.rs b/src/test/compile-fail/auxiliary/struct_field_privacy.rs
similarity index 100%
rename from src/test/compile-fail/aux/struct_field_privacy.rs
rename to src/test/compile-fail/auxiliary/struct_field_privacy.rs
diff --git a/src/test/compile-fail/aux/struct_variant_privacy.rs b/src/test/compile-fail/auxiliary/struct_variant_privacy.rs
similarity index 100%
rename from src/test/compile-fail/aux/struct_variant_privacy.rs
rename to src/test/compile-fail/auxiliary/struct_variant_privacy.rs
diff --git a/src/test/compile-fail/aux/svh-a-base.rs b/src/test/compile-fail/auxiliary/svh-a-base.rs
similarity index 100%
rename from src/test/compile-fail/aux/svh-a-base.rs
rename to src/test/compile-fail/auxiliary/svh-a-base.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-lit.rs b/src/test/compile-fail/auxiliary/svh-a-change-lit.rs
similarity index 100%
rename from src/test/compile-fail/aux/svh-a-change-lit.rs
rename to src/test/compile-fail/auxiliary/svh-a-change-lit.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-significant-cfg.rs b/src/test/compile-fail/auxiliary/svh-a-change-significant-cfg.rs
similarity index 100%
rename from src/test/compile-fail/aux/svh-a-change-significant-cfg.rs
rename to src/test/compile-fail/auxiliary/svh-a-change-significant-cfg.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-trait-bound.rs b/src/test/compile-fail/auxiliary/svh-a-change-trait-bound.rs
similarity index 100%
rename from src/test/compile-fail/aux/svh-a-change-trait-bound.rs
rename to src/test/compile-fail/auxiliary/svh-a-change-trait-bound.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-type-arg.rs b/src/test/compile-fail/auxiliary/svh-a-change-type-arg.rs
similarity index 100%
rename from src/test/compile-fail/aux/svh-a-change-type-arg.rs
rename to src/test/compile-fail/auxiliary/svh-a-change-type-arg.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-type-ret.rs b/src/test/compile-fail/auxiliary/svh-a-change-type-ret.rs
similarity index 100%
rename from src/test/compile-fail/aux/svh-a-change-type-ret.rs
rename to src/test/compile-fail/auxiliary/svh-a-change-type-ret.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-type-static.rs b/src/test/compile-fail/auxiliary/svh-a-change-type-static.rs
similarity index 100%
rename from src/test/compile-fail/aux/svh-a-change-type-static.rs
rename to src/test/compile-fail/auxiliary/svh-a-change-type-static.rs
diff --git a/src/test/compile-fail/aux/svh-b.rs b/src/test/compile-fail/auxiliary/svh-b.rs
similarity index 100%
rename from src/test/compile-fail/aux/svh-b.rs
rename to src/test/compile-fail/auxiliary/svh-b.rs
diff --git a/src/test/compile-fail/aux/svh-uta-base.rs b/src/test/compile-fail/auxiliary/svh-uta-base.rs
similarity index 100%
rename from src/test/compile-fail/aux/svh-uta-base.rs
rename to src/test/compile-fail/auxiliary/svh-uta-base.rs
diff --git a/src/test/compile-fail/aux/svh-uta-change-use-trait.rs b/src/test/compile-fail/auxiliary/svh-uta-change-use-trait.rs
similarity index 100%
rename from src/test/compile-fail/aux/svh-uta-change-use-trait.rs
rename to src/test/compile-fail/auxiliary/svh-uta-change-use-trait.rs
diff --git a/src/test/compile-fail/aux/svh-utb.rs b/src/test/compile-fail/auxiliary/svh-utb.rs
similarity index 100%
rename from src/test/compile-fail/aux/svh-utb.rs
rename to src/test/compile-fail/auxiliary/svh-utb.rs
diff --git a/src/test/compile-fail/aux/tdticc_coherence_lib.rs b/src/test/compile-fail/auxiliary/tdticc_coherence_lib.rs
similarity index 100%
rename from src/test/compile-fail/aux/tdticc_coherence_lib.rs
rename to src/test/compile-fail/auxiliary/tdticc_coherence_lib.rs
diff --git a/src/test/compile-fail/aux/trait_bounds_on_structs_and_enums_xc.rs b/src/test/compile-fail/auxiliary/trait_bounds_on_structs_and_enums_xc.rs
similarity index 100%
rename from src/test/compile-fail/aux/trait_bounds_on_structs_and_enums_xc.rs
rename to src/test/compile-fail/auxiliary/trait_bounds_on_structs_and_enums_xc.rs
diff --git a/src/test/compile-fail/aux/trait_impl_conflict.rs b/src/test/compile-fail/auxiliary/trait_impl_conflict.rs
similarity index 100%
rename from src/test/compile-fail/aux/trait_impl_conflict.rs
rename to src/test/compile-fail/auxiliary/trait_impl_conflict.rs
diff --git a/src/test/compile-fail/aux/trait_safety_lib.rs b/src/test/compile-fail/auxiliary/trait_safety_lib.rs
similarity index 100%
rename from src/test/compile-fail/aux/trait_safety_lib.rs
rename to src/test/compile-fail/auxiliary/trait_safety_lib.rs
diff --git a/src/test/compile-fail/aux/trait_superkinds_in_metadata.rs b/src/test/compile-fail/auxiliary/trait_superkinds_in_metadata.rs
similarity index 100%
rename from src/test/compile-fail/aux/trait_superkinds_in_metadata.rs
rename to src/test/compile-fail/auxiliary/trait_superkinds_in_metadata.rs
diff --git a/src/test/compile-fail/aux/two_macros.rs b/src/test/compile-fail/auxiliary/two_macros.rs
similarity index 100%
rename from src/test/compile-fail/aux/two_macros.rs
rename to src/test/compile-fail/auxiliary/two_macros.rs
diff --git a/src/test/compile-fail/aux/unreachable_variant.rs b/src/test/compile-fail/auxiliary/unreachable_variant.rs
similarity index 100%
rename from src/test/compile-fail/aux/unreachable_variant.rs
rename to src/test/compile-fail/auxiliary/unreachable_variant.rs
diff --git a/src/test/compile-fail/aux/use_from_trait_xc.rs b/src/test/compile-fail/auxiliary/use_from_trait_xc.rs
similarity index 100%
rename from src/test/compile-fail/aux/use_from_trait_xc.rs
rename to src/test/compile-fail/auxiliary/use_from_trait_xc.rs
diff --git a/src/test/compile-fail/aux/variant-namespacing.rs b/src/test/compile-fail/auxiliary/variant-namespacing.rs
similarity index 100%
rename from src/test/compile-fail/aux/variant-namespacing.rs
rename to src/test/compile-fail/auxiliary/variant-namespacing.rs
diff --git a/src/test/compile-fail/aux/weak-lang-items.rs b/src/test/compile-fail/auxiliary/weak-lang-items.rs
similarity index 100%
rename from src/test/compile-fail/aux/weak-lang-items.rs
rename to src/test/compile-fail/auxiliary/weak-lang-items.rs
diff --git a/src/test/compile-fail/aux/xc_private_method_lib.rs b/src/test/compile-fail/auxiliary/xc_private_method_lib.rs
similarity index 100%
rename from src/test/compile-fail/aux/xc_private_method_lib.rs
rename to src/test/compile-fail/auxiliary/xc_private_method_lib.rs
diff --git a/src/test/compile-fail/aux/xcrate_unit_struct.rs b/src/test/compile-fail/auxiliary/xcrate_unit_struct.rs
similarity index 100%
rename from src/test/compile-fail/aux/xcrate_unit_struct.rs
rename to src/test/compile-fail/auxiliary/xcrate_unit_struct.rs
diff --git a/src/test/compile-fail/issue-21146.rs b/src/test/compile-fail/issue-21146.rs
index 7ea6f6f18b9..02f128e1f56 100644
--- a/src/test/compile-fail/issue-21146.rs
+++ b/src/test/compile-fail/issue-21146.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 // error-pattern: expected item, found `parse_error`
-include!("aux/issue-21146-inc.rs");
+include!("auxiliary/issue-21146-inc.rs");
 fn main() {}
diff --git a/src/test/compile-fail/privacy/restricted/aux/pub_restricted.rs b/src/test/compile-fail/privacy/restricted/auxiliary/pub_restricted.rs
similarity index 100%
rename from src/test/compile-fail/privacy/restricted/aux/pub_restricted.rs
rename to src/test/compile-fail/privacy/restricted/auxiliary/pub_restricted.rs
diff --git a/src/test/debuginfo/aux/cross_crate_debuginfo_type_uniquing.rs b/src/test/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs
similarity index 100%
rename from src/test/debuginfo/aux/cross_crate_debuginfo_type_uniquing.rs
rename to src/test/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs
diff --git a/src/test/debuginfo/aux/cross_crate_spans.rs b/src/test/debuginfo/auxiliary/cross_crate_spans.rs
similarity index 100%
rename from src/test/debuginfo/aux/cross_crate_spans.rs
rename to src/test/debuginfo/auxiliary/cross_crate_spans.rs
diff --git a/src/test/debuginfo/aux/issue13213aux.rs b/src/test/debuginfo/auxiliary/issue13213aux.rs
similarity index 100%
rename from src/test/debuginfo/aux/issue13213aux.rs
rename to src/test/debuginfo/auxiliary/issue13213aux.rs
diff --git a/src/test/run-pass-fulldeps/aux/custom_derive_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/custom_derive_plugin.rs
rename to src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs
diff --git a/src/test/run-pass-fulldeps/aux/custom_derive_plugin_attr.rs b/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin_attr.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/custom_derive_plugin_attr.rs
rename to src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin_attr.rs
diff --git a/src/test/run-pass-fulldeps/aux/dummy_mir_pass.rs b/src/test/run-pass-fulldeps/auxiliary/dummy_mir_pass.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/dummy_mir_pass.rs
rename to src/test/run-pass-fulldeps/auxiliary/dummy_mir_pass.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue-13560-1.rs b/src/test/run-pass-fulldeps/auxiliary/issue-13560-1.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/issue-13560-1.rs
rename to src/test/run-pass-fulldeps/auxiliary/issue-13560-1.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue-13560-2.rs b/src/test/run-pass-fulldeps/auxiliary/issue-13560-2.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/issue-13560-2.rs
rename to src/test/run-pass-fulldeps/auxiliary/issue-13560-2.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue-13560-3.rs b/src/test/run-pass-fulldeps/auxiliary/issue-13560-3.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/issue-13560-3.rs
rename to src/test/run-pass-fulldeps/auxiliary/issue-13560-3.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue-16822.rs b/src/test/run-pass-fulldeps/auxiliary/issue-16822.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/issue-16822.rs
rename to src/test/run-pass-fulldeps/auxiliary/issue-16822.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue-18502.rs b/src/test/run-pass-fulldeps/auxiliary/issue-18502.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/issue-18502.rs
rename to src/test/run-pass-fulldeps/auxiliary/issue-18502.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue_16723_multiple_items_syntax_ext.rs b/src/test/run-pass-fulldeps/auxiliary/issue_16723_multiple_items_syntax_ext.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/issue_16723_multiple_items_syntax_ext.rs
rename to src/test/run-pass-fulldeps/auxiliary/issue_16723_multiple_items_syntax_ext.rs
diff --git a/src/test/run-pass-fulldeps/aux/linkage-visibility.rs b/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/linkage-visibility.rs
rename to src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs
diff --git a/src/test/run-pass-fulldeps/aux/lint_for_crate.rs b/src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/lint_for_crate.rs
rename to src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs
diff --git a/src/test/run-pass-fulldeps/aux/lint_group_plugin_test.rs b/src/test/run-pass-fulldeps/auxiliary/lint_group_plugin_test.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/lint_group_plugin_test.rs
rename to src/test/run-pass-fulldeps/auxiliary/lint_group_plugin_test.rs
diff --git a/src/test/run-pass-fulldeps/aux/lint_plugin_test.rs b/src/test/run-pass-fulldeps/auxiliary/lint_plugin_test.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/lint_plugin_test.rs
rename to src/test/run-pass-fulldeps/auxiliary/lint_plugin_test.rs
diff --git a/src/test/run-pass-fulldeps/aux/llvm_pass_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/llvm_pass_plugin.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/llvm_pass_plugin.rs
rename to src/test/run-pass-fulldeps/auxiliary/llvm_pass_plugin.rs
diff --git a/src/test/run-pass-fulldeps/aux/logging_right_crate.rs b/src/test/run-pass-fulldeps/auxiliary/logging_right_crate.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/logging_right_crate.rs
rename to src/test/run-pass-fulldeps/auxiliary/logging_right_crate.rs
diff --git a/src/test/run-pass-fulldeps/aux/lto-syntax-extension-lib.rs b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-lib.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/lto-syntax-extension-lib.rs
rename to src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-lib.rs
diff --git a/src/test/run-pass-fulldeps/aux/lto-syntax-extension-plugin.rs b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/lto-syntax-extension-plugin.rs
rename to src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
diff --git a/src/test/run-pass-fulldeps/aux/macro_crate_test.rs b/src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/macro_crate_test.rs
rename to src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs
diff --git a/src/test/run-pass-fulldeps/aux/plugin_args.rs b/src/test/run-pass-fulldeps/auxiliary/plugin_args.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/plugin_args.rs
rename to src/test/run-pass-fulldeps/auxiliary/plugin_args.rs
diff --git a/src/test/run-pass-fulldeps/aux/plugin_crate_outlive_expansion_phase.rs b/src/test/run-pass-fulldeps/auxiliary/plugin_crate_outlive_expansion_phase.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/plugin_crate_outlive_expansion_phase.rs
rename to src/test/run-pass-fulldeps/auxiliary/plugin_crate_outlive_expansion_phase.rs
diff --git a/src/test/run-pass-fulldeps/aux/plugin_with_plugin_lib.rs b/src/test/run-pass-fulldeps/auxiliary/plugin_with_plugin_lib.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/plugin_with_plugin_lib.rs
rename to src/test/run-pass-fulldeps/auxiliary/plugin_with_plugin_lib.rs
diff --git a/src/test/run-pass-fulldeps/aux/procedural_mbe_matching.rs b/src/test/run-pass-fulldeps/auxiliary/procedural_mbe_matching.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/procedural_mbe_matching.rs
rename to src/test/run-pass-fulldeps/auxiliary/procedural_mbe_matching.rs
diff --git a/src/test/run-pass-fulldeps/aux/roman_numerals.rs b/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/roman_numerals.rs
rename to src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs
diff --git a/src/test/run-pass-fulldeps/aux/syntax_extension_with_dll_deps_1.rs b/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_1.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/syntax_extension_with_dll_deps_1.rs
rename to src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_1.rs
diff --git a/src/test/run-pass-fulldeps/aux/syntax_extension_with_dll_deps_2.rs b/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_2.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/aux/syntax_extension_with_dll_deps_2.rs
rename to src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_2.rs
diff --git a/src/test/run-pass/aux/allocator-dummy.rs b/src/test/run-pass/auxiliary/allocator-dummy.rs
similarity index 100%
rename from src/test/run-pass/aux/allocator-dummy.rs
rename to src/test/run-pass/auxiliary/allocator-dummy.rs
diff --git a/src/test/run-pass/aux/anon-extern-mod-cross-crate-1.rs b/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs
similarity index 100%
rename from src/test/run-pass/aux/anon-extern-mod-cross-crate-1.rs
rename to src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs
diff --git a/src/test/run-pass/aux/anon_trait_static_method_lib.rs b/src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/anon_trait_static_method_lib.rs
rename to src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs
diff --git a/src/test/run-pass/aux/associated-const-cc-lib.rs b/src/test/run-pass/auxiliary/associated-const-cc-lib.rs
similarity index 100%
rename from src/test/run-pass/aux/associated-const-cc-lib.rs
rename to src/test/run-pass/auxiliary/associated-const-cc-lib.rs
diff --git a/src/test/run-pass/aux/associated-types-cc-lib.rs b/src/test/run-pass/auxiliary/associated-types-cc-lib.rs
similarity index 100%
rename from src/test/run-pass/aux/associated-types-cc-lib.rs
rename to src/test/run-pass/auxiliary/associated-types-cc-lib.rs
diff --git a/src/test/run-pass/aux/augmented_assignments.rs b/src/test/run-pass/auxiliary/augmented_assignments.rs
similarity index 100%
rename from src/test/run-pass/aux/augmented_assignments.rs
rename to src/test/run-pass/auxiliary/augmented_assignments.rs
diff --git a/src/test/run-pass/aux/blind-item-mixed-crate-use-item-foo.rs b/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs
similarity index 100%
rename from src/test/run-pass/aux/blind-item-mixed-crate-use-item-foo.rs
rename to src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs
diff --git a/src/test/run-pass/aux/blind-item-mixed-crate-use-item-foo2.rs b/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
similarity index 100%
rename from src/test/run-pass/aux/blind-item-mixed-crate-use-item-foo2.rs
rename to src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
diff --git a/src/test/run-pass/aux/cci_borrow_lib.rs b/src/test/run-pass/auxiliary/cci_borrow_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_borrow_lib.rs
rename to src/test/run-pass/auxiliary/cci_borrow_lib.rs
diff --git a/src/test/run-pass/aux/cci_capture_clause.rs b/src/test/run-pass/auxiliary/cci_capture_clause.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_capture_clause.rs
rename to src/test/run-pass/auxiliary/cci_capture_clause.rs
diff --git a/src/test/run-pass/aux/cci_class.rs b/src/test/run-pass/auxiliary/cci_class.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_class.rs
rename to src/test/run-pass/auxiliary/cci_class.rs
diff --git a/src/test/run-pass/aux/cci_class_2.rs b/src/test/run-pass/auxiliary/cci_class_2.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_class_2.rs
rename to src/test/run-pass/auxiliary/cci_class_2.rs
diff --git a/src/test/run-pass/aux/cci_class_3.rs b/src/test/run-pass/auxiliary/cci_class_3.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_class_3.rs
rename to src/test/run-pass/auxiliary/cci_class_3.rs
diff --git a/src/test/run-pass/aux/cci_class_4.rs b/src/test/run-pass/auxiliary/cci_class_4.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_class_4.rs
rename to src/test/run-pass/auxiliary/cci_class_4.rs
diff --git a/src/test/run-pass/aux/cci_class_6.rs b/src/test/run-pass/auxiliary/cci_class_6.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_class_6.rs
rename to src/test/run-pass/auxiliary/cci_class_6.rs
diff --git a/src/test/run-pass/aux/cci_class_cast.rs b/src/test/run-pass/auxiliary/cci_class_cast.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_class_cast.rs
rename to src/test/run-pass/auxiliary/cci_class_cast.rs
diff --git a/src/test/run-pass/aux/cci_class_trait.rs b/src/test/run-pass/auxiliary/cci_class_trait.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_class_trait.rs
rename to src/test/run-pass/auxiliary/cci_class_trait.rs
diff --git a/src/test/run-pass/aux/cci_const.rs b/src/test/run-pass/auxiliary/cci_const.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_const.rs
rename to src/test/run-pass/auxiliary/cci_const.rs
diff --git a/src/test/run-pass/aux/cci_const_block.rs b/src/test/run-pass/auxiliary/cci_const_block.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_const_block.rs
rename to src/test/run-pass/auxiliary/cci_const_block.rs
diff --git a/src/test/run-pass/aux/cci_impl_lib.rs b/src/test/run-pass/auxiliary/cci_impl_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_impl_lib.rs
rename to src/test/run-pass/auxiliary/cci_impl_lib.rs
diff --git a/src/test/run-pass/aux/cci_intrinsic.rs b/src/test/run-pass/auxiliary/cci_intrinsic.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_intrinsic.rs
rename to src/test/run-pass/auxiliary/cci_intrinsic.rs
diff --git a/src/test/run-pass/aux/cci_iter_lib.rs b/src/test/run-pass/auxiliary/cci_iter_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_iter_lib.rs
rename to src/test/run-pass/auxiliary/cci_iter_lib.rs
diff --git a/src/test/run-pass/aux/cci_nested_lib.rs b/src/test/run-pass/auxiliary/cci_nested_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_nested_lib.rs
rename to src/test/run-pass/auxiliary/cci_nested_lib.rs
diff --git a/src/test/run-pass/aux/cci_no_inline_lib.rs b/src/test/run-pass/auxiliary/cci_no_inline_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/cci_no_inline_lib.rs
rename to src/test/run-pass/auxiliary/cci_no_inline_lib.rs
diff --git a/src/test/run-pass/aux/cfg_inner_static.rs b/src/test/run-pass/auxiliary/cfg_inner_static.rs
similarity index 100%
rename from src/test/run-pass/aux/cfg_inner_static.rs
rename to src/test/run-pass/auxiliary/cfg_inner_static.rs
diff --git a/src/test/run-pass/aux/cgu_test.rs b/src/test/run-pass/auxiliary/cgu_test.rs
similarity index 100%
rename from src/test/run-pass/aux/cgu_test.rs
rename to src/test/run-pass/auxiliary/cgu_test.rs
diff --git a/src/test/run-pass/aux/cgu_test_a.rs b/src/test/run-pass/auxiliary/cgu_test_a.rs
similarity index 100%
rename from src/test/run-pass/aux/cgu_test_a.rs
rename to src/test/run-pass/auxiliary/cgu_test_a.rs
diff --git a/src/test/run-pass/aux/cgu_test_b.rs b/src/test/run-pass/auxiliary/cgu_test_b.rs
similarity index 100%
rename from src/test/run-pass/aux/cgu_test_b.rs
rename to src/test/run-pass/auxiliary/cgu_test_b.rs
diff --git a/src/test/run-pass/aux/check_static_recursion_foreign_helper.rs b/src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs
similarity index 100%
rename from src/test/run-pass/aux/check_static_recursion_foreign_helper.rs
rename to src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs
diff --git a/src/test/run-pass/aux/coherence_copy_like_lib.rs b/src/test/run-pass/auxiliary/coherence_copy_like_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/coherence_copy_like_lib.rs
rename to src/test/run-pass/auxiliary/coherence_copy_like_lib.rs
diff --git a/src/test/run-pass/aux/coherence_lib.rs b/src/test/run-pass/auxiliary/coherence_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/coherence_lib.rs
rename to src/test/run-pass/auxiliary/coherence_lib.rs
diff --git a/src/test/run-pass/aux/const_fn_lib.rs b/src/test/run-pass/auxiliary/const_fn_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/const_fn_lib.rs
rename to src/test/run-pass/auxiliary/const_fn_lib.rs
diff --git a/src/test/run-pass/aux/crate-attributes-using-cfg_attr.rs b/src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs
similarity index 100%
rename from src/test/run-pass/aux/crate-attributes-using-cfg_attr.rs
rename to src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs
diff --git a/src/test/run-pass/aux/crate-method-reexport-grrrrrrr2.rs b/src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs
similarity index 100%
rename from src/test/run-pass/aux/crate-method-reexport-grrrrrrr2.rs
rename to src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs
diff --git a/src/test/run-pass/aux/default_type_params_xc.rs b/src/test/run-pass/auxiliary/default_type_params_xc.rs
similarity index 100%
rename from src/test/run-pass/aux/default_type_params_xc.rs
rename to src/test/run-pass/auxiliary/default_type_params_xc.rs
diff --git a/src/test/run-pass/aux/derive-no-std.rs b/src/test/run-pass/auxiliary/derive-no-std.rs
similarity index 100%
rename from src/test/run-pass/aux/derive-no-std.rs
rename to src/test/run-pass/auxiliary/derive-no-std.rs
diff --git a/src/test/run-pass/aux/empty-struct.rs b/src/test/run-pass/auxiliary/empty-struct.rs
similarity index 100%
rename from src/test/run-pass/aux/empty-struct.rs
rename to src/test/run-pass/auxiliary/empty-struct.rs
diff --git a/src/test/run-pass/aux/explicit_self_xcrate.rs b/src/test/run-pass/auxiliary/explicit_self_xcrate.rs
similarity index 100%
rename from src/test/run-pass/aux/explicit_self_xcrate.rs
rename to src/test/run-pass/auxiliary/explicit_self_xcrate.rs
diff --git a/src/test/run-pass/aux/extern-crosscrate-source.rs b/src/test/run-pass/auxiliary/extern-crosscrate-source.rs
similarity index 100%
rename from src/test/run-pass/aux/extern-crosscrate-source.rs
rename to src/test/run-pass/auxiliary/extern-crosscrate-source.rs
diff --git a/src/test/run-pass/aux/extern-take-value.rs b/src/test/run-pass/auxiliary/extern-take-value.rs
similarity index 100%
rename from src/test/run-pass/aux/extern-take-value.rs
rename to src/test/run-pass/auxiliary/extern-take-value.rs
diff --git a/src/test/run-pass/aux/extern_calling_convention.rs b/src/test/run-pass/auxiliary/extern_calling_convention.rs
similarity index 100%
rename from src/test/run-pass/aux/extern_calling_convention.rs
rename to src/test/run-pass/auxiliary/extern_calling_convention.rs
diff --git a/src/test/run-pass/aux/extern_mod_ordering_lib.rs b/src/test/run-pass/auxiliary/extern_mod_ordering_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/extern_mod_ordering_lib.rs
rename to src/test/run-pass/auxiliary/extern_mod_ordering_lib.rs
diff --git a/src/test/run-pass/aux/fat_drop.rs b/src/test/run-pass/auxiliary/fat_drop.rs
similarity index 100%
rename from src/test/run-pass/aux/fat_drop.rs
rename to src/test/run-pass/auxiliary/fat_drop.rs
diff --git a/src/test/run-pass/aux/fn-abi.rs b/src/test/run-pass/auxiliary/fn-abi.rs
similarity index 100%
rename from src/test/run-pass/aux/fn-abi.rs
rename to src/test/run-pass/auxiliary/fn-abi.rs
diff --git a/src/test/run-pass/aux/foreign_lib.rs b/src/test/run-pass/auxiliary/foreign_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/foreign_lib.rs
rename to src/test/run-pass/auxiliary/foreign_lib.rs
diff --git a/src/test/run-pass/aux/go_trait.rs b/src/test/run-pass/auxiliary/go_trait.rs
similarity index 100%
rename from src/test/run-pass/aux/go_trait.rs
rename to src/test/run-pass/auxiliary/go_trait.rs
diff --git a/src/test/run-pass/aux/i8.rs b/src/test/run-pass/auxiliary/i8.rs
similarity index 100%
rename from src/test/run-pass/aux/i8.rs
rename to src/test/run-pass/auxiliary/i8.rs
diff --git a/src/test/run-pass/aux/impl_privacy_xc_1.rs b/src/test/run-pass/auxiliary/impl_privacy_xc_1.rs
similarity index 100%
rename from src/test/run-pass/aux/impl_privacy_xc_1.rs
rename to src/test/run-pass/auxiliary/impl_privacy_xc_1.rs
diff --git a/src/test/run-pass/aux/impl_privacy_xc_2.rs b/src/test/run-pass/auxiliary/impl_privacy_xc_2.rs
similarity index 100%
rename from src/test/run-pass/aux/impl_privacy_xc_2.rs
rename to src/test/run-pass/auxiliary/impl_privacy_xc_2.rs
diff --git a/src/test/run-pass/aux/inline_dtor.rs b/src/test/run-pass/auxiliary/inline_dtor.rs
similarity index 100%
rename from src/test/run-pass/aux/inline_dtor.rs
rename to src/test/run-pass/auxiliary/inline_dtor.rs
diff --git a/src/test/run-pass/aux/inner_static.rs b/src/test/run-pass/auxiliary/inner_static.rs
similarity index 100%
rename from src/test/run-pass/aux/inner_static.rs
rename to src/test/run-pass/auxiliary/inner_static.rs
diff --git a/src/test/run-pass/aux/iss.rs b/src/test/run-pass/auxiliary/iss.rs
similarity index 100%
rename from src/test/run-pass/aux/iss.rs
rename to src/test/run-pass/auxiliary/iss.rs
diff --git a/src/test/run-pass/aux/issue-10028.rs b/src/test/run-pass/auxiliary/issue-10028.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-10028.rs
rename to src/test/run-pass/auxiliary/issue-10028.rs
diff --git a/src/test/run-pass/aux/issue-11224.rs b/src/test/run-pass/auxiliary/issue-11224.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-11224.rs
rename to src/test/run-pass/auxiliary/issue-11224.rs
diff --git a/src/test/run-pass/aux/issue-11225-1.rs b/src/test/run-pass/auxiliary/issue-11225-1.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-11225-1.rs
rename to src/test/run-pass/auxiliary/issue-11225-1.rs
diff --git a/src/test/run-pass/aux/issue-11225-2.rs b/src/test/run-pass/auxiliary/issue-11225-2.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-11225-2.rs
rename to src/test/run-pass/auxiliary/issue-11225-2.rs
diff --git a/src/test/run-pass/aux/issue-11225-3.rs b/src/test/run-pass/auxiliary/issue-11225-3.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-11225-3.rs
rename to src/test/run-pass/auxiliary/issue-11225-3.rs
diff --git a/src/test/run-pass/aux/issue-11508.rs b/src/test/run-pass/auxiliary/issue-11508.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-11508.rs
rename to src/test/run-pass/auxiliary/issue-11508.rs
diff --git a/src/test/run-pass/aux/issue-11529.rs b/src/test/run-pass/auxiliary/issue-11529.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-11529.rs
rename to src/test/run-pass/auxiliary/issue-11529.rs
diff --git a/src/test/run-pass/aux/issue-12133-dylib.rs b/src/test/run-pass/auxiliary/issue-12133-dylib.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-12133-dylib.rs
rename to src/test/run-pass/auxiliary/issue-12133-dylib.rs
diff --git a/src/test/run-pass/aux/issue-12133-dylib2.rs b/src/test/run-pass/auxiliary/issue-12133-dylib2.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-12133-dylib2.rs
rename to src/test/run-pass/auxiliary/issue-12133-dylib2.rs
diff --git a/src/test/run-pass/aux/issue-12133-rlib.rs b/src/test/run-pass/auxiliary/issue-12133-rlib.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-12133-rlib.rs
rename to src/test/run-pass/auxiliary/issue-12133-rlib.rs
diff --git a/src/test/run-pass/aux/issue-12660-aux.rs b/src/test/run-pass/auxiliary/issue-12660-aux.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-12660-aux.rs
rename to src/test/run-pass/auxiliary/issue-12660-aux.rs
diff --git a/src/test/run-pass/aux/issue-13620-1.rs b/src/test/run-pass/auxiliary/issue-13620-1.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-13620-1.rs
rename to src/test/run-pass/auxiliary/issue-13620-1.rs
diff --git a/src/test/run-pass/aux/issue-13620-2.rs b/src/test/run-pass/auxiliary/issue-13620-2.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-13620-2.rs
rename to src/test/run-pass/auxiliary/issue-13620-2.rs
diff --git a/src/test/run-pass/aux/issue-13872-1.rs b/src/test/run-pass/auxiliary/issue-13872-1.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-13872-1.rs
rename to src/test/run-pass/auxiliary/issue-13872-1.rs
diff --git a/src/test/run-pass/aux/issue-13872-2.rs b/src/test/run-pass/auxiliary/issue-13872-2.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-13872-2.rs
rename to src/test/run-pass/auxiliary/issue-13872-2.rs
diff --git a/src/test/run-pass/aux/issue-13872-3.rs b/src/test/run-pass/auxiliary/issue-13872-3.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-13872-3.rs
rename to src/test/run-pass/auxiliary/issue-13872-3.rs
diff --git a/src/test/run-pass/aux/issue-14344-1.rs b/src/test/run-pass/auxiliary/issue-14344-1.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-14344-1.rs
rename to src/test/run-pass/auxiliary/issue-14344-1.rs
diff --git a/src/test/run-pass/aux/issue-14344-2.rs b/src/test/run-pass/auxiliary/issue-14344-2.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-14344-2.rs
rename to src/test/run-pass/auxiliary/issue-14344-2.rs
diff --git a/src/test/run-pass/aux/issue-14421.rs b/src/test/run-pass/auxiliary/issue-14421.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-14421.rs
rename to src/test/run-pass/auxiliary/issue-14421.rs
diff --git a/src/test/run-pass/aux/issue-14422.rs b/src/test/run-pass/auxiliary/issue-14422.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-14422.rs
rename to src/test/run-pass/auxiliary/issue-14422.rs
diff --git a/src/test/run-pass/aux/issue-15562.rs b/src/test/run-pass/auxiliary/issue-15562.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-15562.rs
rename to src/test/run-pass/auxiliary/issue-15562.rs
diff --git a/src/test/run-pass/aux/issue-16643.rs b/src/test/run-pass/auxiliary/issue-16643.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-16643.rs
rename to src/test/run-pass/auxiliary/issue-16643.rs
diff --git a/src/test/run-pass/aux/issue-17662.rs b/src/test/run-pass/auxiliary/issue-17662.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-17662.rs
rename to src/test/run-pass/auxiliary/issue-17662.rs
diff --git a/src/test/run-pass/aux/issue-17718-aux.rs b/src/test/run-pass/auxiliary/issue-17718-aux.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-17718-aux.rs
rename to src/test/run-pass/auxiliary/issue-17718-aux.rs
diff --git a/src/test/run-pass/aux/issue-18501.rs b/src/test/run-pass/auxiliary/issue-18501.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-18501.rs
rename to src/test/run-pass/auxiliary/issue-18501.rs
diff --git a/src/test/run-pass/aux/issue-18514.rs b/src/test/run-pass/auxiliary/issue-18514.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-18514.rs
rename to src/test/run-pass/auxiliary/issue-18514.rs
diff --git a/src/test/run-pass/aux/issue-18711.rs b/src/test/run-pass/auxiliary/issue-18711.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-18711.rs
rename to src/test/run-pass/auxiliary/issue-18711.rs
diff --git a/src/test/run-pass/aux/issue-18913-1.rs b/src/test/run-pass/auxiliary/issue-18913-1.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-18913-1.rs
rename to src/test/run-pass/auxiliary/issue-18913-1.rs
diff --git a/src/test/run-pass/aux/issue-18913-2.rs b/src/test/run-pass/auxiliary/issue-18913-2.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-18913-2.rs
rename to src/test/run-pass/auxiliary/issue-18913-2.rs
diff --git a/src/test/run-pass/aux/issue-19340-1.rs b/src/test/run-pass/auxiliary/issue-19340-1.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-19340-1.rs
rename to src/test/run-pass/auxiliary/issue-19340-1.rs
diff --git a/src/test/run-pass/aux/issue-2380.rs b/src/test/run-pass/auxiliary/issue-2380.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-2380.rs
rename to src/test/run-pass/auxiliary/issue-2380.rs
diff --git a/src/test/run-pass/aux/issue-2414-a.rs b/src/test/run-pass/auxiliary/issue-2414-a.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-2414-a.rs
rename to src/test/run-pass/auxiliary/issue-2414-a.rs
diff --git a/src/test/run-pass/aux/issue-2414-b.rs b/src/test/run-pass/auxiliary/issue-2414-b.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-2414-b.rs
rename to src/test/run-pass/auxiliary/issue-2414-b.rs
diff --git a/src/test/run-pass/aux/issue-25185-1.rs b/src/test/run-pass/auxiliary/issue-25185-1.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-25185-1.rs
rename to src/test/run-pass/auxiliary/issue-25185-1.rs
diff --git a/src/test/run-pass/aux/issue-25185-2.rs b/src/test/run-pass/auxiliary/issue-25185-2.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-25185-2.rs
rename to src/test/run-pass/auxiliary/issue-25185-2.rs
diff --git a/src/test/run-pass/aux/issue-2526.rs b/src/test/run-pass/auxiliary/issue-2526.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-2526.rs
rename to src/test/run-pass/auxiliary/issue-2526.rs
diff --git a/src/test/run-pass/aux/issue-25467.rs b/src/test/run-pass/auxiliary/issue-25467.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-25467.rs
rename to src/test/run-pass/auxiliary/issue-25467.rs
diff --git a/src/test/run-pass/aux/issue-2631-a.rs b/src/test/run-pass/auxiliary/issue-2631-a.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-2631-a.rs
rename to src/test/run-pass/auxiliary/issue-2631-a.rs
diff --git a/src/test/run-pass/aux/issue-29485.rs b/src/test/run-pass/auxiliary/issue-29485.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-29485.rs
rename to src/test/run-pass/auxiliary/issue-29485.rs
diff --git a/src/test/run-pass/aux/issue-3012-1.rs b/src/test/run-pass/auxiliary/issue-3012-1.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-3012-1.rs
rename to src/test/run-pass/auxiliary/issue-3012-1.rs
diff --git a/src/test/run-pass/aux/issue-31702-1.rs b/src/test/run-pass/auxiliary/issue-31702-1.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-31702-1.rs
rename to src/test/run-pass/auxiliary/issue-31702-1.rs
diff --git a/src/test/run-pass/aux/issue-31702-2.rs b/src/test/run-pass/auxiliary/issue-31702-2.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-31702-2.rs
rename to src/test/run-pass/auxiliary/issue-31702-2.rs
diff --git a/src/test/run-pass/aux/issue-4208-cc.rs b/src/test/run-pass/auxiliary/issue-4208-cc.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-4208-cc.rs
rename to src/test/run-pass/auxiliary/issue-4208-cc.rs
diff --git a/src/test/run-pass/aux/issue-4545.rs b/src/test/run-pass/auxiliary/issue-4545.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-4545.rs
rename to src/test/run-pass/auxiliary/issue-4545.rs
diff --git a/src/test/run-pass/aux/issue-5518.rs b/src/test/run-pass/auxiliary/issue-5518.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-5518.rs
rename to src/test/run-pass/auxiliary/issue-5518.rs
diff --git a/src/test/run-pass/aux/issue-5521.rs b/src/test/run-pass/auxiliary/issue-5521.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-5521.rs
rename to src/test/run-pass/auxiliary/issue-5521.rs
diff --git a/src/test/run-pass/aux/issue-7178.rs b/src/test/run-pass/auxiliary/issue-7178.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-7178.rs
rename to src/test/run-pass/auxiliary/issue-7178.rs
diff --git a/src/test/run-pass/aux/issue-7899.rs b/src/test/run-pass/auxiliary/issue-7899.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-7899.rs
rename to src/test/run-pass/auxiliary/issue-7899.rs
diff --git a/src/test/run-pass/aux/issue-8044.rs b/src/test/run-pass/auxiliary/issue-8044.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-8044.rs
rename to src/test/run-pass/auxiliary/issue-8044.rs
diff --git a/src/test/run-pass/aux/issue-8259.rs b/src/test/run-pass/auxiliary/issue-8259.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-8259.rs
rename to src/test/run-pass/auxiliary/issue-8259.rs
diff --git a/src/test/run-pass/aux/issue-9906.rs b/src/test/run-pass/auxiliary/issue-9906.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-9906.rs
rename to src/test/run-pass/auxiliary/issue-9906.rs
diff --git a/src/test/run-pass/aux/issue-9968.rs b/src/test/run-pass/auxiliary/issue-9968.rs
similarity index 100%
rename from src/test/run-pass/aux/issue-9968.rs
rename to src/test/run-pass/auxiliary/issue-9968.rs
diff --git a/src/test/run-pass/aux/issue13507.rs b/src/test/run-pass/auxiliary/issue13507.rs
similarity index 100%
rename from src/test/run-pass/aux/issue13507.rs
rename to src/test/run-pass/auxiliary/issue13507.rs
diff --git a/src/test/run-pass/aux/issue2170lib.rs b/src/test/run-pass/auxiliary/issue2170lib.rs
similarity index 100%
rename from src/test/run-pass/aux/issue2170lib.rs
rename to src/test/run-pass/auxiliary/issue2170lib.rs
diff --git a/src/test/run-pass/aux/issue_10031_aux.rs b/src/test/run-pass/auxiliary/issue_10031_aux.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_10031_aux.rs
rename to src/test/run-pass/auxiliary/issue_10031_aux.rs
diff --git a/src/test/run-pass/aux/issue_12612_1.rs b/src/test/run-pass/auxiliary/issue_12612_1.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_12612_1.rs
rename to src/test/run-pass/auxiliary/issue_12612_1.rs
diff --git a/src/test/run-pass/aux/issue_12612_2.rs b/src/test/run-pass/auxiliary/issue_12612_2.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_12612_2.rs
rename to src/test/run-pass/auxiliary/issue_12612_2.rs
diff --git a/src/test/run-pass/aux/issue_19293.rs b/src/test/run-pass/auxiliary/issue_19293.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_19293.rs
rename to src/test/run-pass/auxiliary/issue_19293.rs
diff --git a/src/test/run-pass/aux/issue_20389.rs b/src/test/run-pass/auxiliary/issue_20389.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_20389.rs
rename to src/test/run-pass/auxiliary/issue_20389.rs
diff --git a/src/test/run-pass/aux/issue_2316_a.rs b/src/test/run-pass/auxiliary/issue_2316_a.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_2316_a.rs
rename to src/test/run-pass/auxiliary/issue_2316_a.rs
diff --git a/src/test/run-pass/aux/issue_2316_b.rs b/src/test/run-pass/auxiliary/issue_2316_b.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_2316_b.rs
rename to src/test/run-pass/auxiliary/issue_2316_b.rs
diff --git a/src/test/run-pass/aux/issue_2472_b.rs b/src/test/run-pass/auxiliary/issue_2472_b.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_2472_b.rs
rename to src/test/run-pass/auxiliary/issue_2472_b.rs
diff --git a/src/test/run-pass/aux/issue_2723_a.rs b/src/test/run-pass/auxiliary/issue_2723_a.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_2723_a.rs
rename to src/test/run-pass/auxiliary/issue_2723_a.rs
diff --git a/src/test/run-pass/aux/issue_3136_a.rc b/src/test/run-pass/auxiliary/issue_3136_a.rc
similarity index 100%
rename from src/test/run-pass/aux/issue_3136_a.rc
rename to src/test/run-pass/auxiliary/issue_3136_a.rc
diff --git a/src/test/run-pass/aux/issue_3136_a.rs b/src/test/run-pass/auxiliary/issue_3136_a.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_3136_a.rs
rename to src/test/run-pass/auxiliary/issue_3136_a.rs
diff --git a/src/test/run-pass/aux/issue_3979_traits.rs b/src/test/run-pass/auxiliary/issue_3979_traits.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_3979_traits.rs
rename to src/test/run-pass/auxiliary/issue_3979_traits.rs
diff --git a/src/test/run-pass/aux/issue_8401.rs b/src/test/run-pass/auxiliary/issue_8401.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_8401.rs
rename to src/test/run-pass/auxiliary/issue_8401.rs
diff --git a/src/test/run-pass/aux/issue_9123.rs b/src/test/run-pass/auxiliary/issue_9123.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_9123.rs
rename to src/test/run-pass/auxiliary/issue_9123.rs
diff --git a/src/test/run-pass/aux/issue_9155.rs b/src/test/run-pass/auxiliary/issue_9155.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_9155.rs
rename to src/test/run-pass/auxiliary/issue_9155.rs
diff --git a/src/test/run-pass/aux/issue_9188.rs b/src/test/run-pass/auxiliary/issue_9188.rs
similarity index 100%
rename from src/test/run-pass/aux/issue_9188.rs
rename to src/test/run-pass/auxiliary/issue_9188.rs
diff --git a/src/test/run-pass/aux/kinds_in_metadata.rs b/src/test/run-pass/auxiliary/kinds_in_metadata.rs
similarity index 100%
rename from src/test/run-pass/aux/kinds_in_metadata.rs
rename to src/test/run-pass/auxiliary/kinds_in_metadata.rs
diff --git a/src/test/run-pass/aux/linkage1.rs b/src/test/run-pass/auxiliary/linkage1.rs
similarity index 100%
rename from src/test/run-pass/aux/linkage1.rs
rename to src/test/run-pass/auxiliary/linkage1.rs
diff --git a/src/test/run-pass/aux/macro-include-items-expr.rs b/src/test/run-pass/auxiliary/macro-include-items-expr.rs
similarity index 100%
rename from src/test/run-pass/aux/macro-include-items-expr.rs
rename to src/test/run-pass/auxiliary/macro-include-items-expr.rs
diff --git a/src/test/run-pass/aux/macro-include-items-item.rs b/src/test/run-pass/auxiliary/macro-include-items-item.rs
similarity index 100%
rename from src/test/run-pass/aux/macro-include-items-item.rs
rename to src/test/run-pass/auxiliary/macro-include-items-item.rs
diff --git a/src/test/run-pass/aux/macro_crate_def_only.rs b/src/test/run-pass/auxiliary/macro_crate_def_only.rs
similarity index 100%
rename from src/test/run-pass/aux/macro_crate_def_only.rs
rename to src/test/run-pass/auxiliary/macro_crate_def_only.rs
diff --git a/src/test/run-pass/aux/macro_crate_nonterminal.rs b/src/test/run-pass/auxiliary/macro_crate_nonterminal.rs
similarity index 100%
rename from src/test/run-pass/aux/macro_crate_nonterminal.rs
rename to src/test/run-pass/auxiliary/macro_crate_nonterminal.rs
diff --git a/src/test/run-pass/aux/macro_export_inner_module.rs b/src/test/run-pass/auxiliary/macro_export_inner_module.rs
similarity index 100%
rename from src/test/run-pass/aux/macro_export_inner_module.rs
rename to src/test/run-pass/auxiliary/macro_export_inner_module.rs
diff --git a/src/test/run-pass/aux/macro_reexport_1.rs b/src/test/run-pass/auxiliary/macro_reexport_1.rs
similarity index 100%
rename from src/test/run-pass/aux/macro_reexport_1.rs
rename to src/test/run-pass/auxiliary/macro_reexport_1.rs
diff --git a/src/test/run-pass/aux/macro_reexport_2.rs b/src/test/run-pass/auxiliary/macro_reexport_2.rs
similarity index 100%
rename from src/test/run-pass/aux/macro_reexport_2.rs
rename to src/test/run-pass/auxiliary/macro_reexport_2.rs
diff --git a/src/test/run-pass/aux/macro_reexport_2_no_use.rs b/src/test/run-pass/auxiliary/macro_reexport_2_no_use.rs
similarity index 100%
rename from src/test/run-pass/aux/macro_reexport_2_no_use.rs
rename to src/test/run-pass/auxiliary/macro_reexport_2_no_use.rs
diff --git a/src/test/run-pass/aux/macro_with_super_1.rs b/src/test/run-pass/auxiliary/macro_with_super_1.rs
similarity index 100%
rename from src/test/run-pass/aux/macro_with_super_1.rs
rename to src/test/run-pass/auxiliary/macro_with_super_1.rs
diff --git a/src/test/run-pass/aux/method_self_arg1.rs b/src/test/run-pass/auxiliary/method_self_arg1.rs
similarity index 100%
rename from src/test/run-pass/aux/method_self_arg1.rs
rename to src/test/run-pass/auxiliary/method_self_arg1.rs
diff --git a/src/test/run-pass/aux/method_self_arg2.rs b/src/test/run-pass/auxiliary/method_self_arg2.rs
similarity index 100%
rename from src/test/run-pass/aux/method_self_arg2.rs
rename to src/test/run-pass/auxiliary/method_self_arg2.rs
diff --git a/src/test/run-pass/aux/mir_external_refs.rs b/src/test/run-pass/auxiliary/mir_external_refs.rs
similarity index 100%
rename from src/test/run-pass/aux/mir_external_refs.rs
rename to src/test/run-pass/auxiliary/mir_external_refs.rs
diff --git a/src/test/run-pass/aux/moves_based_on_type_lib.rs b/src/test/run-pass/auxiliary/moves_based_on_type_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/moves_based_on_type_lib.rs
rename to src/test/run-pass/auxiliary/moves_based_on_type_lib.rs
diff --git a/src/test/run-pass/aux/msvc-data-only-lib.rs b/src/test/run-pass/auxiliary/msvc-data-only-lib.rs
similarity index 100%
rename from src/test/run-pass/aux/msvc-data-only-lib.rs
rename to src/test/run-pass/auxiliary/msvc-data-only-lib.rs
diff --git a/src/test/run-pass/aux/namespaced_enum_emulate_flat.rs b/src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.rs
similarity index 100%
rename from src/test/run-pass/aux/namespaced_enum_emulate_flat.rs
rename to src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.rs
diff --git a/src/test/run-pass/aux/namespaced_enums.rs b/src/test/run-pass/auxiliary/namespaced_enums.rs
similarity index 100%
rename from src/test/run-pass/aux/namespaced_enums.rs
rename to src/test/run-pass/auxiliary/namespaced_enums.rs
diff --git a/src/test/run-pass/aux/nested_item.rs b/src/test/run-pass/auxiliary/nested_item.rs
similarity index 100%
rename from src/test/run-pass/aux/nested_item.rs
rename to src/test/run-pass/auxiliary/nested_item.rs
diff --git a/src/test/run-pass/aux/newtype_struct_xc.rs b/src/test/run-pass/auxiliary/newtype_struct_xc.rs
similarity index 100%
rename from src/test/run-pass/aux/newtype_struct_xc.rs
rename to src/test/run-pass/auxiliary/newtype_struct_xc.rs
diff --git a/src/test/run-pass/aux/overloaded_autoderef_xc.rs b/src/test/run-pass/auxiliary/overloaded_autoderef_xc.rs
similarity index 100%
rename from src/test/run-pass/aux/overloaded_autoderef_xc.rs
rename to src/test/run-pass/auxiliary/overloaded_autoderef_xc.rs
diff --git a/src/test/run-pass/aux/packed.rs b/src/test/run-pass/auxiliary/packed.rs
similarity index 100%
rename from src/test/run-pass/aux/packed.rs
rename to src/test/run-pass/auxiliary/packed.rs
diff --git a/src/test/run-pass/aux/priv-impl-prim-ty.rs b/src/test/run-pass/auxiliary/priv-impl-prim-ty.rs
similarity index 100%
rename from src/test/run-pass/aux/priv-impl-prim-ty.rs
rename to src/test/run-pass/auxiliary/priv-impl-prim-ty.rs
diff --git a/src/test/run-pass/aux/privacy_reexport.rs b/src/test/run-pass/auxiliary/privacy_reexport.rs
similarity index 100%
rename from src/test/run-pass/aux/privacy_reexport.rs
rename to src/test/run-pass/auxiliary/privacy_reexport.rs
diff --git a/src/test/run-pass/aux/pub_use_mods_xcrate.rs b/src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs
similarity index 100%
rename from src/test/run-pass/aux/pub_use_mods_xcrate.rs
rename to src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs
diff --git a/src/test/run-pass/aux/pub_use_xcrate1.rs b/src/test/run-pass/auxiliary/pub_use_xcrate1.rs
similarity index 100%
rename from src/test/run-pass/aux/pub_use_xcrate1.rs
rename to src/test/run-pass/auxiliary/pub_use_xcrate1.rs
diff --git a/src/test/run-pass/aux/pub_use_xcrate2.rs b/src/test/run-pass/auxiliary/pub_use_xcrate2.rs
similarity index 100%
rename from src/test/run-pass/aux/pub_use_xcrate2.rs
rename to src/test/run-pass/auxiliary/pub_use_xcrate2.rs
diff --git a/src/test/run-pass/aux/reachable-unnameable-items.rs b/src/test/run-pass/auxiliary/reachable-unnameable-items.rs
similarity index 100%
rename from src/test/run-pass/aux/reachable-unnameable-items.rs
rename to src/test/run-pass/auxiliary/reachable-unnameable-items.rs
diff --git a/src/test/run-pass/aux/reexport-should-still-link.rs b/src/test/run-pass/auxiliary/reexport-should-still-link.rs
similarity index 100%
rename from src/test/run-pass/aux/reexport-should-still-link.rs
rename to src/test/run-pass/auxiliary/reexport-should-still-link.rs
diff --git a/src/test/run-pass/aux/reexported_static_methods.rs b/src/test/run-pass/auxiliary/reexported_static_methods.rs
similarity index 100%
rename from src/test/run-pass/aux/reexported_static_methods.rs
rename to src/test/run-pass/auxiliary/reexported_static_methods.rs
diff --git a/src/test/run-pass/aux/sepcomp-extern-lib.rs b/src/test/run-pass/auxiliary/sepcomp-extern-lib.rs
similarity index 100%
rename from src/test/run-pass/aux/sepcomp-extern-lib.rs
rename to src/test/run-pass/auxiliary/sepcomp-extern-lib.rs
diff --git a/src/test/run-pass/aux/sepcomp_cci_lib.rs b/src/test/run-pass/auxiliary/sepcomp_cci_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/sepcomp_cci_lib.rs
rename to src/test/run-pass/auxiliary/sepcomp_cci_lib.rs
diff --git a/src/test/run-pass/aux/sepcomp_lib.rs b/src/test/run-pass/auxiliary/sepcomp_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/sepcomp_lib.rs
rename to src/test/run-pass/auxiliary/sepcomp_lib.rs
diff --git a/src/test/run-pass/aux/static-function-pointer-aux.rs b/src/test/run-pass/auxiliary/static-function-pointer-aux.rs
similarity index 100%
rename from src/test/run-pass/aux/static-function-pointer-aux.rs
rename to src/test/run-pass/auxiliary/static-function-pointer-aux.rs
diff --git a/src/test/run-pass/aux/static-methods-crate.rs b/src/test/run-pass/auxiliary/static-methods-crate.rs
similarity index 100%
rename from src/test/run-pass/aux/static-methods-crate.rs
rename to src/test/run-pass/auxiliary/static-methods-crate.rs
diff --git a/src/test/run-pass/aux/static_fn_inline_xc_aux.rs b/src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs
similarity index 100%
rename from src/test/run-pass/aux/static_fn_inline_xc_aux.rs
rename to src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs
diff --git a/src/test/run-pass/aux/static_fn_trait_xc_aux.rs b/src/test/run-pass/auxiliary/static_fn_trait_xc_aux.rs
similarity index 100%
rename from src/test/run-pass/aux/static_fn_trait_xc_aux.rs
rename to src/test/run-pass/auxiliary/static_fn_trait_xc_aux.rs
diff --git a/src/test/run-pass/aux/static_mut_xc.rs b/src/test/run-pass/auxiliary/static_mut_xc.rs
similarity index 100%
rename from src/test/run-pass/aux/static_mut_xc.rs
rename to src/test/run-pass/auxiliary/static_mut_xc.rs
diff --git a/src/test/run-pass/aux/struct_destructuring_cross_crate.rs b/src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs
similarity index 100%
rename from src/test/run-pass/aux/struct_destructuring_cross_crate.rs
rename to src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs
diff --git a/src/test/run-pass/aux/struct_variant_xc_aux.rs b/src/test/run-pass/auxiliary/struct_variant_xc_aux.rs
similarity index 100%
rename from src/test/run-pass/aux/struct_variant_xc_aux.rs
rename to src/test/run-pass/auxiliary/struct_variant_xc_aux.rs
diff --git a/src/test/run-pass/aux/svh-a-base.rs b/src/test/run-pass/auxiliary/svh-a-base.rs
similarity index 100%
rename from src/test/run-pass/aux/svh-a-base.rs
rename to src/test/run-pass/auxiliary/svh-a-base.rs
diff --git a/src/test/run-pass/aux/svh-a-comment.rs b/src/test/run-pass/auxiliary/svh-a-comment.rs
similarity index 100%
rename from src/test/run-pass/aux/svh-a-comment.rs
rename to src/test/run-pass/auxiliary/svh-a-comment.rs
diff --git a/src/test/run-pass/aux/svh-a-doc.rs b/src/test/run-pass/auxiliary/svh-a-doc.rs
similarity index 100%
rename from src/test/run-pass/aux/svh-a-doc.rs
rename to src/test/run-pass/auxiliary/svh-a-doc.rs
diff --git a/src/test/run-pass/aux/svh-a-macro.rs b/src/test/run-pass/auxiliary/svh-a-macro.rs
similarity index 100%
rename from src/test/run-pass/aux/svh-a-macro.rs
rename to src/test/run-pass/auxiliary/svh-a-macro.rs
diff --git a/src/test/run-pass/aux/svh-a-no-change.rs b/src/test/run-pass/auxiliary/svh-a-no-change.rs
similarity index 100%
rename from src/test/run-pass/aux/svh-a-no-change.rs
rename to src/test/run-pass/auxiliary/svh-a-no-change.rs
diff --git a/src/test/run-pass/aux/svh-a-redundant-cfg.rs b/src/test/run-pass/auxiliary/svh-a-redundant-cfg.rs
similarity index 100%
rename from src/test/run-pass/aux/svh-a-redundant-cfg.rs
rename to src/test/run-pass/auxiliary/svh-a-redundant-cfg.rs
diff --git a/src/test/run-pass/aux/svh-a-whitespace.rs b/src/test/run-pass/auxiliary/svh-a-whitespace.rs
similarity index 100%
rename from src/test/run-pass/aux/svh-a-whitespace.rs
rename to src/test/run-pass/auxiliary/svh-a-whitespace.rs
diff --git a/src/test/run-pass/aux/svh-b.rs b/src/test/run-pass/auxiliary/svh-b.rs
similarity index 100%
rename from src/test/run-pass/aux/svh-b.rs
rename to src/test/run-pass/auxiliary/svh-b.rs
diff --git a/src/test/run-pass/aux/thread-local-extern-static.rs b/src/test/run-pass/auxiliary/thread-local-extern-static.rs
similarity index 100%
rename from src/test/run-pass/aux/thread-local-extern-static.rs
rename to src/test/run-pass/auxiliary/thread-local-extern-static.rs
diff --git a/src/test/run-pass/aux/trait_default_method_xc_aux.rs b/src/test/run-pass/auxiliary/trait_default_method_xc_aux.rs
similarity index 100%
rename from src/test/run-pass/aux/trait_default_method_xc_aux.rs
rename to src/test/run-pass/auxiliary/trait_default_method_xc_aux.rs
diff --git a/src/test/run-pass/aux/trait_default_method_xc_aux_2.rs b/src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.rs
similarity index 100%
rename from src/test/run-pass/aux/trait_default_method_xc_aux_2.rs
rename to src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.rs
diff --git a/src/test/run-pass/aux/trait_inheritance_auto_xc_2_aux.rs b/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs
similarity index 100%
rename from src/test/run-pass/aux/trait_inheritance_auto_xc_2_aux.rs
rename to src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs
diff --git a/src/test/run-pass/aux/trait_inheritance_auto_xc_aux.rs b/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs
similarity index 100%
rename from src/test/run-pass/aux/trait_inheritance_auto_xc_aux.rs
rename to src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs
diff --git a/src/test/run-pass/aux/trait_inheritance_cross_trait_call_xc_aux.rs b/src/test/run-pass/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs
similarity index 100%
rename from src/test/run-pass/aux/trait_inheritance_cross_trait_call_xc_aux.rs
rename to src/test/run-pass/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs
diff --git a/src/test/run-pass/aux/trait_inheritance_overloading_xc.rs b/src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs
similarity index 100%
rename from src/test/run-pass/aux/trait_inheritance_overloading_xc.rs
rename to src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs
diff --git a/src/test/run-pass/aux/trait_safety_lib.rs b/src/test/run-pass/auxiliary/trait_safety_lib.rs
similarity index 100%
rename from src/test/run-pass/aux/trait_safety_lib.rs
rename to src/test/run-pass/auxiliary/trait_safety_lib.rs
diff --git a/src/test/run-pass/aux/trait_superkinds_in_metadata.rs b/src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs
similarity index 100%
rename from src/test/run-pass/aux/trait_superkinds_in_metadata.rs
rename to src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs
diff --git a/src/test/run-pass/aux/traitimpl.rs b/src/test/run-pass/auxiliary/traitimpl.rs
similarity index 100%
rename from src/test/run-pass/aux/traitimpl.rs
rename to src/test/run-pass/auxiliary/traitimpl.rs
diff --git a/src/test/run-pass/aux/two_macros.rs b/src/test/run-pass/auxiliary/two_macros.rs
similarity index 100%
rename from src/test/run-pass/aux/two_macros.rs
rename to src/test/run-pass/auxiliary/two_macros.rs
diff --git a/src/test/run-pass/aux/typeid-intrinsic-aux1.rs b/src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs
similarity index 100%
rename from src/test/run-pass/aux/typeid-intrinsic-aux1.rs
rename to src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs
diff --git a/src/test/run-pass/aux/typeid-intrinsic-aux2.rs b/src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs
similarity index 100%
rename from src/test/run-pass/aux/typeid-intrinsic-aux2.rs
rename to src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs
diff --git a/src/test/run-pass/aux/unboxed-closures-cross-crate.rs b/src/test/run-pass/auxiliary/unboxed-closures-cross-crate.rs
similarity index 100%
rename from src/test/run-pass/aux/unboxed-closures-cross-crate.rs
rename to src/test/run-pass/auxiliary/unboxed-closures-cross-crate.rs
diff --git a/src/test/run-pass/aux/weak-lang-items.rs b/src/test/run-pass/auxiliary/weak-lang-items.rs
similarity index 100%
rename from src/test/run-pass/aux/weak-lang-items.rs
rename to src/test/run-pass/auxiliary/weak-lang-items.rs
diff --git a/src/test/run-pass/aux/where_clauses_xc.rs b/src/test/run-pass/auxiliary/where_clauses_xc.rs
similarity index 100%
rename from src/test/run-pass/aux/where_clauses_xc.rs
rename to src/test/run-pass/auxiliary/where_clauses_xc.rs
diff --git a/src/test/run-pass/aux/xcrate-trait-lifetime-param.rs b/src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs
similarity index 100%
rename from src/test/run-pass/aux/xcrate-trait-lifetime-param.rs
rename to src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs
diff --git a/src/test/run-pass/aux/xcrate_address_insignificant.rs b/src/test/run-pass/auxiliary/xcrate_address_insignificant.rs
similarity index 100%
rename from src/test/run-pass/aux/xcrate_address_insignificant.rs
rename to src/test/run-pass/auxiliary/xcrate_address_insignificant.rs
diff --git a/src/test/run-pass/aux/xcrate_associated_type_defaults.rs b/src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs
similarity index 100%
rename from src/test/run-pass/aux/xcrate_associated_type_defaults.rs
rename to src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs
diff --git a/src/test/run-pass/aux/xcrate_static_addresses.rs b/src/test/run-pass/auxiliary/xcrate_static_addresses.rs
similarity index 100%
rename from src/test/run-pass/aux/xcrate_static_addresses.rs
rename to src/test/run-pass/auxiliary/xcrate_static_addresses.rs
diff --git a/src/test/run-pass/aux/xcrate_struct_aliases.rs b/src/test/run-pass/auxiliary/xcrate_struct_aliases.rs
similarity index 100%
rename from src/test/run-pass/aux/xcrate_struct_aliases.rs
rename to src/test/run-pass/auxiliary/xcrate_struct_aliases.rs
diff --git a/src/test/run-pass/aux/xcrate_unit_struct.rs b/src/test/run-pass/auxiliary/xcrate_unit_struct.rs
similarity index 100%
rename from src/test/run-pass/aux/xcrate_unit_struct.rs
rename to src/test/run-pass/auxiliary/xcrate_unit_struct.rs
diff --git a/src/test/run-pass/import-crate-with-invalid-spans/aux/crate_with_invalid_spans.rs b/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs
similarity index 100%
rename from src/test/run-pass/import-crate-with-invalid-spans/aux/crate_with_invalid_spans.rs
rename to src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs
diff --git a/src/test/run-pass/import-crate-with-invalid-spans/aux/crate_with_invalid_spans_macros.rs b/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs
similarity index 100%
rename from src/test/run-pass/import-crate-with-invalid-spans/aux/crate_with_invalid_spans_macros.rs
rename to src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs
diff --git a/src/test/run-pass/issue24687-embed-debuginfo/aux/issue24687_lib.rs b/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs
similarity index 100%
rename from src/test/run-pass/issue24687-embed-debuginfo/aux/issue24687_lib.rs
rename to src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs
diff --git a/src/test/run-pass/issue24687-embed-debuginfo/aux/issue24687_mbcs_in_comments.rs b/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs
similarity index 100%
rename from src/test/run-pass/issue24687-embed-debuginfo/aux/issue24687_mbcs_in_comments.rs
rename to src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs
diff --git a/src/test/run-pass/macro-include-items.rs b/src/test/run-pass/macro-include-items.rs
index a2e1d86a990..1e31c85afad 100644
--- a/src/test/run-pass/macro-include-items.rs
+++ b/src/test/run-pass/macro-include-items.rs
@@ -12,9 +12,9 @@
 
 fn bar() {}
 
-include!(concat!("", "", "aux/", "macro-include-items-item.rs"));
+include!(concat!("", "", "auxiliary/", "macro-include-items-item.rs"));
 
 fn main() {
     foo();
-    assert_eq!(include!(concat!("", "aux/", "macro-include-items-expr.rs")), 1_usize);
+    assert_eq!(include!(concat!("", "auxiliary/", "macro-include-items-expr.rs")), 1_usize);
 }
diff --git a/src/test/run-pass/specialization/aux/go_trait.rs b/src/test/run-pass/specialization/auxiliary/go_trait.rs
similarity index 100%
rename from src/test/run-pass/specialization/aux/go_trait.rs
rename to src/test/run-pass/specialization/auxiliary/go_trait.rs
diff --git a/src/test/run-pass/specialization/aux/specialization_cross_crate.rs b/src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs
similarity index 100%
rename from src/test/run-pass/specialization/aux/specialization_cross_crate.rs
rename to src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs
diff --git a/src/test/run-pass/specialization/aux/specialization_cross_crate_defaults.rs b/src/test/run-pass/specialization/auxiliary/specialization_cross_crate_defaults.rs
similarity index 100%
rename from src/test/run-pass/specialization/aux/specialization_cross_crate_defaults.rs
rename to src/test/run-pass/specialization/auxiliary/specialization_cross_crate_defaults.rs
diff --git a/src/test/rustdoc/aux/empty.rs b/src/test/rustdoc/auxiliary/empty.rs
similarity index 100%
rename from src/test/rustdoc/aux/empty.rs
rename to src/test/rustdoc/auxiliary/empty.rs
diff --git a/src/test/rustdoc/aux/inline-default-methods.rs b/src/test/rustdoc/auxiliary/inline-default-methods.rs
similarity index 100%
rename from src/test/rustdoc/aux/inline-default-methods.rs
rename to src/test/rustdoc/auxiliary/inline-default-methods.rs
diff --git a/src/test/rustdoc/aux/issue-13698.rs b/src/test/rustdoc/auxiliary/issue-13698.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-13698.rs
rename to src/test/rustdoc/auxiliary/issue-13698.rs
diff --git a/src/test/rustdoc/aux/issue-15318.rs b/src/test/rustdoc/auxiliary/issue-15318.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-15318.rs
rename to src/test/rustdoc/auxiliary/issue-15318.rs
diff --git a/src/test/rustdoc/aux/issue-17476.rs b/src/test/rustdoc/auxiliary/issue-17476.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-17476.rs
rename to src/test/rustdoc/auxiliary/issue-17476.rs
diff --git a/src/test/rustdoc/aux/issue-19190-3.rs b/src/test/rustdoc/auxiliary/issue-19190-3.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-19190-3.rs
rename to src/test/rustdoc/auxiliary/issue-19190-3.rs
diff --git a/src/test/rustdoc/aux/issue-20646.rs b/src/test/rustdoc/auxiliary/issue-20646.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-20646.rs
rename to src/test/rustdoc/auxiliary/issue-20646.rs
diff --git a/src/test/rustdoc/aux/issue-20727.rs b/src/test/rustdoc/auxiliary/issue-20727.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-20727.rs
rename to src/test/rustdoc/auxiliary/issue-20727.rs
diff --git a/src/test/rustdoc/aux/issue-21092.rs b/src/test/rustdoc/auxiliary/issue-21092.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-21092.rs
rename to src/test/rustdoc/auxiliary/issue-21092.rs
diff --git a/src/test/rustdoc/aux/issue-21801.rs b/src/test/rustdoc/auxiliary/issue-21801.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-21801.rs
rename to src/test/rustdoc/auxiliary/issue-21801.rs
diff --git a/src/test/rustdoc/aux/issue-22025.rs b/src/test/rustdoc/auxiliary/issue-22025.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-22025.rs
rename to src/test/rustdoc/auxiliary/issue-22025.rs
diff --git a/src/test/rustdoc/aux/issue-23207-1.rs b/src/test/rustdoc/auxiliary/issue-23207-1.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-23207-1.rs
rename to src/test/rustdoc/auxiliary/issue-23207-1.rs
diff --git a/src/test/rustdoc/aux/issue-23207-2.rs b/src/test/rustdoc/auxiliary/issue-23207-2.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-23207-2.rs
rename to src/test/rustdoc/auxiliary/issue-23207-2.rs
diff --git a/src/test/rustdoc/aux/issue-26606-macro.rs b/src/test/rustdoc/auxiliary/issue-26606-macro.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-26606-macro.rs
rename to src/test/rustdoc/auxiliary/issue-26606-macro.rs
diff --git a/src/test/rustdoc/aux/issue-27362.rs b/src/test/rustdoc/auxiliary/issue-27362.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-27362.rs
rename to src/test/rustdoc/auxiliary/issue-27362.rs
diff --git a/src/test/rustdoc/aux/issue-28927-1.rs b/src/test/rustdoc/auxiliary/issue-28927-1.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-28927-1.rs
rename to src/test/rustdoc/auxiliary/issue-28927-1.rs
diff --git a/src/test/rustdoc/aux/issue-28927-2.rs b/src/test/rustdoc/auxiliary/issue-28927-2.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-28927-2.rs
rename to src/test/rustdoc/auxiliary/issue-28927-2.rs
diff --git a/src/test/rustdoc/aux/issue-29584.rs b/src/test/rustdoc/auxiliary/issue-29584.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-29584.rs
rename to src/test/rustdoc/auxiliary/issue-29584.rs
diff --git a/src/test/rustdoc/aux/issue-30109-1.rs b/src/test/rustdoc/auxiliary/issue-30109-1.rs
similarity index 100%
rename from src/test/rustdoc/aux/issue-30109-1.rs
rename to src/test/rustdoc/auxiliary/issue-30109-1.rs
diff --git a/src/test/rustdoc/aux/reexp_stripped.rs b/src/test/rustdoc/auxiliary/reexp_stripped.rs
similarity index 100%
rename from src/test/rustdoc/aux/reexp_stripped.rs
rename to src/test/rustdoc/auxiliary/reexp_stripped.rs
diff --git a/src/test/rustdoc/aux/rustdoc-default-impl.rs b/src/test/rustdoc/auxiliary/rustdoc-default-impl.rs
similarity index 100%
rename from src/test/rustdoc/aux/rustdoc-default-impl.rs
rename to src/test/rustdoc/auxiliary/rustdoc-default-impl.rs
diff --git a/src/test/rustdoc/aux/rustdoc-extern-default-method.rs b/src/test/rustdoc/auxiliary/rustdoc-extern-default-method.rs
similarity index 100%
rename from src/test/rustdoc/aux/rustdoc-extern-default-method.rs
rename to src/test/rustdoc/auxiliary/rustdoc-extern-default-method.rs
diff --git a/src/test/rustdoc/aux/rustdoc-extern-method.rs b/src/test/rustdoc/auxiliary/rustdoc-extern-method.rs
similarity index 100%
rename from src/test/rustdoc/aux/rustdoc-extern-method.rs
rename to src/test/rustdoc/auxiliary/rustdoc-extern-method.rs
diff --git a/src/test/rustdoc/aux/rustdoc-ffi.rs b/src/test/rustdoc/auxiliary/rustdoc-ffi.rs
similarity index 100%
rename from src/test/rustdoc/aux/rustdoc-ffi.rs
rename to src/test/rustdoc/auxiliary/rustdoc-ffi.rs
diff --git a/src/test/rustdoc/aux/rustdoc-impl-parts-crosscrate.rs b/src/test/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs
similarity index 100%
rename from src/test/rustdoc/aux/rustdoc-impl-parts-crosscrate.rs
rename to src/test/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs
diff --git a/src/test/rustdoc/aux/variant-struct.rs b/src/test/rustdoc/auxiliary/variant-struct.rs
similarity index 100%
rename from src/test/rustdoc/aux/variant-struct.rs
rename to src/test/rustdoc/auxiliary/variant-struct.rs
diff --git a/src/test/rustdoc/inline_cross/aux/issue-33113.rs b/src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs
similarity index 100%
rename from src/test/rustdoc/inline_cross/aux/issue-33113.rs
rename to src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs
diff --git a/src/test/rustdoc/inline_cross/aux/rustdoc-hidden-sig.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs
similarity index 100%
rename from src/test/rustdoc/inline_cross/aux/rustdoc-hidden-sig.rs
rename to src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs
diff --git a/src/test/rustdoc/inline_cross/aux/rustdoc-hidden.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs
similarity index 100%
rename from src/test/rustdoc/inline_cross/aux/rustdoc-hidden.rs
rename to src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs
diff --git a/src/test/rustdoc/inline_cross/aux/rustdoc-nonreachable-impls.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs
similarity index 100%
rename from src/test/rustdoc/inline_cross/aux/rustdoc-nonreachable-impls.rs
rename to src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs
diff --git a/src/test/rustdoc/inline_cross/aux/rustdoc-trait-object-impl.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs
similarity index 100%
rename from src/test/rustdoc/inline_cross/aux/rustdoc-trait-object-impl.rs
rename to src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index 6e1cae9b25c..245c3992bee 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -360,7 +360,7 @@ fn collect_tests_from_dir(config: &Config,
             tests.push(make_test(config, &paths))
         } else if file_path.is_dir() {
             let relative_file_path = relative_dir_path.join(file.file_name());
-            if &file_name == "aux" {
+            if &file_name == "auxiliary" {
                 // `aux` directories contain other crates used for
                 // cross-crate tests. Don't search them for tests, but
                 // do create a directory in the build dir for them,
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 858cecf8612..74e4b81f555 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1153,7 +1153,7 @@ actual:\n\
         let test_ab = self.testpaths.file
                                     .parent()
                                     .expect("test file path has no parent")
-                                    .join("aux")
+                                    .join("auxiliary")
                                     .join(rel_ab);
         if !test_ab.exists() {
             self.fatal(&format!("aux-build `{}` source not found", test_ab.display()))
@@ -1163,7 +1163,7 @@ actual:\n\
             file: test_ab,
             base: self.testpaths.base.clone(),
             relative_dir: self.testpaths.relative_dir
-                                        .join("aux")
+                                        .join("auxiliary")
                                         .join(rel_ab)
                                         .parent()
                                         .expect("aux-build path has no parent")