diff --git a/test/CodeGen/MIR/AArch64/spill-fold.mir b/test/CodeGen/AArch64/spill-fold.mir
similarity index 100%
rename from test/CodeGen/MIR/AArch64/spill-fold.mir
rename to test/CodeGen/AArch64/spill-fold.mir
diff --git a/test/CodeGen/MIR/AMDGPU/fold-imm-f16-f32.mir b/test/CodeGen/AMDGPU/fold-imm-f16-f32.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/fold-imm-f16-f32.mir
rename to test/CodeGen/AMDGPU/fold-imm-f16-f32.mir
diff --git a/test/CodeGen/MIR/AMDGPU/fold-multiple.mir b/test/CodeGen/AMDGPU/fold-multiple.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/fold-multiple.mir
rename to test/CodeGen/AMDGPU/fold-multiple.mir
diff --git a/test/CodeGen/MIR/AMDGPU/memory-legalizer-atomic-insert-end.mir b/test/CodeGen/AMDGPU/memory-legalizer-atomic-insert-end.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/memory-legalizer-atomic-insert-end.mir
rename to test/CodeGen/AMDGPU/memory-legalizer-atomic-insert-end.mir
diff --git a/test/CodeGen/MIR/AMDGPU/memory-legalizer-multiple-mem-operands-atomics.mir b/test/CodeGen/AMDGPU/memory-legalizer-multiple-mem-operands-atomics.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/memory-legalizer-multiple-mem-operands-atomics.mir
rename to test/CodeGen/AMDGPU/memory-legalizer-multiple-mem-operands-atomics.mir
diff --git a/test/CodeGen/MIR/AMDGPU/memory-legalizer-multiple-mem-operands-nontemporal-1.mir b/test/CodeGen/AMDGPU/memory-legalizer-multiple-mem-operands-nontemporal-1.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/memory-legalizer-multiple-mem-operands-nontemporal-1.mir
rename to test/CodeGen/AMDGPU/memory-legalizer-multiple-mem-operands-nontemporal-1.mir
diff --git a/test/CodeGen/MIR/AMDGPU/memory-legalizer-multiple-mem-operands-nontemporal-2.mir b/test/CodeGen/AMDGPU/memory-legalizer-multiple-mem-operands-nontemporal-2.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/memory-legalizer-multiple-mem-operands-nontemporal-2.mir
rename to test/CodeGen/AMDGPU/memory-legalizer-multiple-mem-operands-nontemporal-2.mir
diff --git a/test/CodeGen/MIR/ARM/PR32721_ifcvt_triangle_unanalyzable.mir b/test/CodeGen/ARM/PR32721_ifcvt_triangle_unanalyzable.mir
similarity index 100%
rename from test/CodeGen/MIR/ARM/PR32721_ifcvt_triangle_unanalyzable.mir
rename to test/CodeGen/ARM/PR32721_ifcvt_triangle_unanalyzable.mir
diff --git a/test/CodeGen/MIR/ARM/ifcvt_canFallThroughTo.mir b/test/CodeGen/ARM/ifcvt_canFallThroughTo.mir
similarity index 100%
rename from test/CodeGen/MIR/ARM/ifcvt_canFallThroughTo.mir
rename to test/CodeGen/ARM/ifcvt_canFallThroughTo.mir
diff --git a/test/CodeGen/MIR/ARM/ifcvt_diamond_unanalyzable.mir b/test/CodeGen/ARM/ifcvt_diamond_unanalyzable.mir
similarity index 100%
rename from test/CodeGen/MIR/ARM/ifcvt_diamond_unanalyzable.mir
rename to test/CodeGen/ARM/ifcvt_diamond_unanalyzable.mir
diff --git a/test/CodeGen/MIR/ARM/ifcvt_forked_diamond_unanalyzable.mir b/test/CodeGen/ARM/ifcvt_forked_diamond_unanalyzable.mir
similarity index 100%
rename from test/CodeGen/MIR/ARM/ifcvt_forked_diamond_unanalyzable.mir
rename to test/CodeGen/ARM/ifcvt_forked_diamond_unanalyzable.mir
diff --git a/test/CodeGen/MIR/ARM/ifcvt_simple_bad_zero_prob_succ.mir b/test/CodeGen/ARM/ifcvt_simple_bad_zero_prob_succ.mir
similarity index 100%
rename from test/CodeGen/MIR/ARM/ifcvt_simple_bad_zero_prob_succ.mir
rename to test/CodeGen/ARM/ifcvt_simple_bad_zero_prob_succ.mir
diff --git a/test/CodeGen/MIR/ARM/ifcvt_simple_unanalyzable.mir b/test/CodeGen/ARM/ifcvt_simple_unanalyzable.mir
similarity index 100%
rename from test/CodeGen/MIR/ARM/ifcvt_simple_unanalyzable.mir
rename to test/CodeGen/ARM/ifcvt_simple_unanalyzable.mir
diff --git a/test/CodeGen/MIR/ARM/ifcvt_triangleWoCvtToNextEdge.mir b/test/CodeGen/ARM/ifcvt_triangleWoCvtToNextEdge.mir
similarity index 100%
rename from test/CodeGen/MIR/ARM/ifcvt_triangleWoCvtToNextEdge.mir
rename to test/CodeGen/ARM/ifcvt_triangleWoCvtToNextEdge.mir
diff --git a/test/CodeGen/MIR/X86/dynamic-regmask.ll b/test/CodeGen/X86/dynamic-regmask.ll
similarity index 100%
rename from test/CodeGen/MIR/X86/dynamic-regmask.ll
rename to test/CodeGen/X86/dynamic-regmask.ll
diff --git a/test/CodeGen/MIR/X86/opt_phis.mir b/test/CodeGen/X86/opt_phis.mir
similarity index 100%
rename from test/CodeGen/MIR/X86/opt_phis.mir
rename to test/CodeGen/X86/opt_phis.mir
diff --git a/test/CodeGen/MIR/X86/shrink_wrap_dbg_value.mir b/test/CodeGen/X86/shrink_wrap_dbg_value.mir
similarity index 100%
rename from test/CodeGen/MIR/X86/shrink_wrap_dbg_value.mir
rename to test/CodeGen/X86/shrink_wrap_dbg_value.mir
diff --git a/test/CodeGen/MIR/X86/simple-register-allocation-read-undef.mir b/test/CodeGen/X86/simple-register-allocation-read-undef.mir
similarity index 100%
rename from test/CodeGen/MIR/X86/simple-register-allocation-read-undef.mir
rename to test/CodeGen/X86/simple-register-allocation-read-undef.mir
diff --git a/test/CodeGen/MIR/X86/unreachable-mbb-undef-phi.mir b/test/CodeGen/X86/unreachable-mbb-undef-phi.mir
similarity index 100%
rename from test/CodeGen/MIR/X86/unreachable-mbb-undef-phi.mir
rename to test/CodeGen/X86/unreachable-mbb-undef-phi.mir