diff --git a/src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.32bit b/src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.32bit.mir
similarity index 100%
rename from src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.32bit
rename to src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.32bit.mir
diff --git a/src/test/mir-opt/combine_array_len.norm2.InstCombine.diff.32bit b/src/test/mir-opt/combine_array_len.norm2.InstCombine.32bit.diff
similarity index 100%
rename from src/test/mir-opt/combine_array_len.norm2.InstCombine.diff.32bit
rename to src/test/mir-opt/combine_array_len.norm2.InstCombine.32bit.diff
diff --git a/src/test/mir-opt/const_allocation.main.ConstProp.after.mir.32bit b/src/test/mir-opt/const_allocation.main.ConstProp.after.32bit.mir
similarity index 100%
rename from src/test/mir-opt/const_allocation.main.ConstProp.after.mir.32bit
rename to src/test/mir-opt/const_allocation.main.ConstProp.after.32bit.mir
diff --git a/src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.32bit b/src/test/mir-opt/const_allocation2.main.ConstProp.after.32bit.mir
similarity index 100%
rename from src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.32bit
rename to src/test/mir-opt/const_allocation2.main.ConstProp.after.32bit.mir
diff --git a/src/test/mir-opt/const_allocation3.main.ConstProp.after.mir.32bit b/src/test/mir-opt/const_allocation3.main.ConstProp.after.32bit.mir
similarity index 100%
rename from src/test/mir-opt/const_allocation3.main.ConstProp.after.mir.32bit
rename to src/test/mir-opt/const_allocation3.main.ConstProp.after.32bit.mir
diff --git a/src/test/mir-opt/const_prop/array_index.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/array_index.main.ConstProp.32bit.diff
similarity index 100%
rename from src/test/mir-opt/const_prop/array_index.main.ConstProp.diff.32bit
rename to src/test/mir-opt/const_prop/array_index.main.ConstProp.32bit.diff
diff --git a/src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff
similarity index 100%
rename from src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.diff.32bit
rename to src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff
diff --git a/src/test/mir-opt/const_prop/discriminant.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff
similarity index 100%
rename from src/test/mir-opt/const_prop/discriminant.main.ConstProp.diff.32bit
rename to src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff
diff --git a/src/test/mir-opt/const_prop/large_array_index.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.diff
similarity index 100%
rename from src/test/mir-opt/const_prop/large_array_index.main.ConstProp.diff.32bit
rename to src/test/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.diff
diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.32bit.diff
similarity index 100%
rename from src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.diff.32bit
rename to src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.32bit.diff
diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.mir.32bit b/src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.32bit.mir
similarity index 100%
rename from src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.mir.32bit
rename to src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.32bit.mir
diff --git a/src/test/mir-opt/const_prop/repeat.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/repeat.main.ConstProp.32bit.diff
similarity index 100%
rename from src/test/mir-opt/const_prop/repeat.main.ConstProp.diff.32bit
rename to src/test/mir-opt/const_prop/repeat.main.ConstProp.32bit.diff
diff --git a/src/test/mir-opt/const_prop/slice_len.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/slice_len.main.ConstProp.32bit.diff
similarity index 100%
rename from src/test/mir-opt/const_prop/slice_len.main.ConstProp.diff.32bit
rename to src/test/mir-opt/const_prop/slice_len.main.ConstProp.32bit.diff
diff --git a/src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff.32bit b/src/test/mir-opt/inline/inline_into_box_place.main.Inline.32bit.diff
similarity index 100%
rename from src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff.32bit
rename to src/test/mir-opt/inline/inline_into_box_place.main.Inline.32bit.diff
diff --git a/src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.mir.32bit b/src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.32bit.mir
similarity index 100%
rename from src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.mir.32bit
rename to src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.32bit.mir
diff --git a/src/test/mir-opt/issue_72181.bar.mir_map.0.mir.32bit b/src/test/mir-opt/issue_72181.bar.mir_map.0.32bit.mir
similarity index 100%
rename from src/test/mir-opt/issue_72181.bar.mir_map.0.mir.32bit
rename to src/test/mir-opt/issue_72181.bar.mir_map.0.32bit.mir
diff --git a/src/test/mir-opt/issue_72181.foo.mir_map.0.mir.32bit b/src/test/mir-opt/issue_72181.foo.mir_map.0.32bit.mir
similarity index 100%
rename from src/test/mir-opt/issue_72181.foo.mir_map.0.mir.32bit
rename to src/test/mir-opt/issue_72181.foo.mir_map.0.32bit.mir
diff --git a/src/test/mir-opt/issue_72181.main.mir_map.0.mir.32bit b/src/test/mir-opt/issue_72181.main.mir_map.0.32bit.mir
similarity index 100%
rename from src/test/mir-opt/issue_72181.main.mir_map.0.mir.32bit
rename to src/test/mir-opt/issue_72181.main.mir_map.0.32bit.mir
diff --git a/src/test/mir-opt/issue_73223.main.PreCodegen.diff.32bit b/src/test/mir-opt/issue_73223.main.PreCodegen.32bit.diff
similarity index 100%
rename from src/test/mir-opt/issue_73223.main.PreCodegen.diff.32bit
rename to src/test/mir-opt/issue_73223.main.PreCodegen.32bit.diff
diff --git a/src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.diff.32bit b/src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.32bit.diff
similarity index 100%
rename from src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.diff.32bit
rename to src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.32bit.diff
diff --git a/src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff.32bit b/src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.32bit.diff
similarity index 100%
rename from src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff.32bit
rename to src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.32bit.diff
diff --git a/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff.32bit b/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.32bit.diff
similarity index 100%
rename from src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff.32bit
rename to src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.32bit.diff
diff --git a/src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff.32bit b/src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.32bit.diff
similarity index 100%
rename from src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff.32bit
rename to src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.32bit.diff
diff --git a/src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.32bit b/src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.32bit.diff
similarity index 100%
rename from src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.32bit
rename to src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.32bit.diff
diff --git a/src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.mir.32bit b/src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir
similarity index 100%
rename from src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.mir.32bit
rename to src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir
diff --git a/src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.32bit b/src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.32bit.mir
similarity index 100%
rename from src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.32bit
rename to src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.32bit.mir
diff --git a/src/test/mir-opt/simple_match.match_bool.mir_map.0.mir.32bit b/src/test/mir-opt/simple_match.match_bool.mir_map.0.32bit.mir
similarity index 100%
rename from src/test/mir-opt/simple_match.match_bool.mir_map.0.mir.32bit
rename to src/test/mir-opt/simple_match.match_bool.mir_map.0.32bit.mir
diff --git a/src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.diff.32bit b/src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.32bit.diff
similarity index 100%
rename from src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.diff.32bit
rename to src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.32bit.diff
diff --git a/src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.32bit b/src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.32bit.diff
similarity index 100%
rename from src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.32bit
rename to src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.32bit.diff
diff --git a/src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir.32bit b/src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.32bit.mir
similarity index 100%
rename from src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir.32bit
rename to src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.32bit.mir
diff --git a/src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.mir.32bit b/src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.32bit.mir
similarity index 100%
rename from src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.mir.32bit
rename to src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.32bit.mir
diff --git a/src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.mir.32bit b/src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.32bit.mir
similarity index 100%
rename from src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.mir.32bit
rename to src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.32bit.mir
diff --git a/src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir.32bit b/src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.32bit.mir
similarity index 100%
rename from src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir.32bit
rename to src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.32bit.mir
diff --git a/src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.32bit b/src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.32bit.mir
similarity index 100%
rename from src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.32bit
rename to src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.32bit.mir
diff --git a/src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.diff.32bit b/src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.32bit.diff
similarity index 100%
rename from src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.diff.32bit
rename to src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.32bit.diff
diff --git a/src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir.32bit b/src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.32bit.mir
similarity index 100%
rename from src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir.32bit
rename to src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.32bit.mir