diff --git a/src/test/mir-opt/enum_cast.bar.built.after.mir b/src/test/mir-opt/building/enum_cast.bar.built.after.mir
similarity index 100%
rename from src/test/mir-opt/enum_cast.bar.built.after.mir
rename to src/test/mir-opt/building/enum_cast.bar.built.after.mir
diff --git a/src/test/mir-opt/enum_cast.boo.built.after.mir b/src/test/mir-opt/building/enum_cast.boo.built.after.mir
similarity index 100%
rename from src/test/mir-opt/enum_cast.boo.built.after.mir
rename to src/test/mir-opt/building/enum_cast.boo.built.after.mir
diff --git a/src/test/mir-opt/enum_cast.droppy.built.after.mir b/src/test/mir-opt/building/enum_cast.droppy.built.after.mir
similarity index 100%
rename from src/test/mir-opt/enum_cast.droppy.built.after.mir
rename to src/test/mir-opt/building/enum_cast.droppy.built.after.mir
diff --git a/src/test/mir-opt/enum_cast.foo.built.after.mir b/src/test/mir-opt/building/enum_cast.foo.built.after.mir
similarity index 100%
rename from src/test/mir-opt/enum_cast.foo.built.after.mir
rename to src/test/mir-opt/building/enum_cast.foo.built.after.mir
diff --git a/src/test/mir-opt/enum_cast.rs b/src/test/mir-opt/building/enum_cast.rs
similarity index 100%
rename from src/test/mir-opt/enum_cast.rs
rename to src/test/mir-opt/building/enum_cast.rs
diff --git a/src/test/mir-opt/issue-101867.rs b/src/test/mir-opt/building/issue-101867.rs
similarity index 100%
rename from src/test/mir-opt/issue-101867.rs
rename to src/test/mir-opt/building/issue-101867.rs
diff --git a/src/test/mir-opt/issue-49232.rs b/src/test/mir-opt/building/issue-49232.rs
similarity index 100%
rename from src/test/mir-opt/issue-49232.rs
rename to src/test/mir-opt/building/issue-49232.rs
diff --git a/src/test/mir-opt/issue_101867.main.built.after.mir b/src/test/mir-opt/building/issue_101867.main.built.after.mir
similarity index 100%
rename from src/test/mir-opt/issue_101867.main.built.after.mir
rename to src/test/mir-opt/building/issue_101867.main.built.after.mir
diff --git a/src/test/mir-opt/issue_49232.main.built.after.mir b/src/test/mir-opt/building/issue_49232.main.built.after.mir
similarity index 100%
rename from src/test/mir-opt/issue_49232.main.built.after.mir
rename to src/test/mir-opt/building/issue_49232.main.built.after.mir
diff --git a/src/test/mir-opt/receiver-ptr-mutability.rs b/src/test/mir-opt/building/receiver-ptr-mutability.rs
similarity index 100%
rename from src/test/mir-opt/receiver-ptr-mutability.rs
rename to src/test/mir-opt/building/receiver-ptr-mutability.rs
diff --git a/src/test/mir-opt/receiver_ptr_mutability.main.built.after.mir b/src/test/mir-opt/building/receiver_ptr_mutability.main.built.after.mir
similarity index 100%
rename from src/test/mir-opt/receiver_ptr_mutability.main.built.after.mir
rename to src/test/mir-opt/building/receiver_ptr_mutability.main.built.after.mir
diff --git a/src/test/mir-opt/simple-match.rs b/src/test/mir-opt/building/simple-match.rs
similarity index 100%
rename from src/test/mir-opt/simple-match.rs
rename to src/test/mir-opt/building/simple-match.rs
diff --git a/src/test/mir-opt/simple_match.match_bool.built.after.mir b/src/test/mir-opt/building/simple_match.match_bool.built.after.mir
similarity index 100%
rename from src/test/mir-opt/simple_match.match_bool.built.after.mir
rename to src/test/mir-opt/building/simple_match.match_bool.built.after.mir
diff --git a/src/test/mir-opt/storage_live_dead_in_statics.XXX.built.after.mir b/src/test/mir-opt/building/storage_live_dead_in_statics.XXX.built.after.mir
similarity index 100%
rename from src/test/mir-opt/storage_live_dead_in_statics.XXX.built.after.mir
rename to src/test/mir-opt/building/storage_live_dead_in_statics.XXX.built.after.mir
diff --git a/src/test/mir-opt/storage_live_dead_in_statics.rs b/src/test/mir-opt/building/storage_live_dead_in_statics.rs
similarity index 100%
rename from src/test/mir-opt/storage_live_dead_in_statics.rs
rename to src/test/mir-opt/building/storage_live_dead_in_statics.rs
diff --git a/src/test/mir-opt/uniform_array_move_out.move_out_by_subslice.built.after.mir b/src/test/mir-opt/building/uniform_array_move_out.move_out_by_subslice.built.after.mir
similarity index 100%
rename from src/test/mir-opt/uniform_array_move_out.move_out_by_subslice.built.after.mir
rename to src/test/mir-opt/building/uniform_array_move_out.move_out_by_subslice.built.after.mir
diff --git a/src/test/mir-opt/uniform_array_move_out.move_out_from_end.built.after.mir b/src/test/mir-opt/building/uniform_array_move_out.move_out_from_end.built.after.mir
similarity index 100%
rename from src/test/mir-opt/uniform_array_move_out.move_out_from_end.built.after.mir
rename to src/test/mir-opt/building/uniform_array_move_out.move_out_from_end.built.after.mir
diff --git a/src/test/mir-opt/uniform_array_move_out.rs b/src/test/mir-opt/building/uniform_array_move_out.rs
similarity index 100%
rename from src/test/mir-opt/uniform_array_move_out.rs
rename to src/test/mir-opt/building/uniform_array_move_out.rs