diff --git a/test/CodeGen/MIR/AArch64/ldst-opt-zr-clobber.mir b/test/CodeGen/AArch64/ldst-opt-zr-clobber.mir
similarity index 100%
rename from test/CodeGen/MIR/AArch64/ldst-opt-zr-clobber.mir
rename to test/CodeGen/AArch64/ldst-opt-zr-clobber.mir
diff --git a/test/CodeGen/MIR/AArch64/machine-dead-copy.mir b/test/CodeGen/AArch64/machine-dead-copy.mir
similarity index 100%
rename from test/CodeGen/MIR/AArch64/machine-dead-copy.mir
rename to test/CodeGen/AArch64/machine-dead-copy.mir
diff --git a/test/CodeGen/MIR/AArch64/machine-scheduler.mir b/test/CodeGen/AArch64/machine-scheduler.mir
similarity index 100%
rename from test/CodeGen/MIR/AArch64/machine-scheduler.mir
rename to test/CodeGen/AArch64/machine-scheduler.mir
diff --git a/test/CodeGen/MIR/AArch64/machine-sink-zr.mir b/test/CodeGen/AArch64/machine-sink-zr.mir
similarity index 100%
rename from test/CodeGen/MIR/AArch64/machine-sink-zr.mir
rename to test/CodeGen/AArch64/machine-sink-zr.mir
diff --git a/test/CodeGen/MIR/AMDGPU/coalescer-subreg-join.mir b/test/CodeGen/AMDGPU/coalescer-subreg-join.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/coalescer-subreg-join.mir
rename to test/CodeGen/AMDGPU/coalescer-subreg-join.mir
diff --git a/test/CodeGen/MIR/AMDGPU/detect-dead-lanes.mir b/test/CodeGen/AMDGPU/detect-dead-lanes.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/detect-dead-lanes.mir
rename to test/CodeGen/AMDGPU/detect-dead-lanes.mir
diff --git a/test/CodeGen/MIR/AMDGPU/insert-waits-exp.mir b/test/CodeGen/AMDGPU/insert-waits-exp.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/insert-waits-exp.mir
rename to test/CodeGen/AMDGPU/insert-waits-exp.mir
diff --git a/test/CodeGen/MIR/AMDGPU/inserted-wait-states.mir b/test/CodeGen/AMDGPU/inserted-wait-states.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/inserted-wait-states.mir
rename to test/CodeGen/AMDGPU/inserted-wait-states.mir
diff --git a/test/CodeGen/MIR/AMDGPU/invert-br-undef-vcc.mir b/test/CodeGen/AMDGPU/invert-br-undef-vcc.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/invert-br-undef-vcc.mir
rename to test/CodeGen/AMDGPU/invert-br-undef-vcc.mir
diff --git a/test/CodeGen/MIR/AMDGPU/liveness.mir b/test/CodeGen/AMDGPU/liveness.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/liveness.mir
rename to test/CodeGen/AMDGPU/liveness.mir
diff --git a/test/CodeGen/MIR/AMDGPU/movrels-bug.mir b/test/CodeGen/AMDGPU/movrels-bug.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/movrels-bug.mir
rename to test/CodeGen/AMDGPU/movrels-bug.mir
diff --git a/test/CodeGen/MIR/AMDGPU/optimize-if-exec-masking.mir b/test/CodeGen/AMDGPU/optimize-if-exec-masking.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/optimize-if-exec-masking.mir
rename to test/CodeGen/AMDGPU/optimize-if-exec-masking.mir
diff --git a/test/CodeGen/MIR/AMDGPU/rename-independent-subregs.mir b/test/CodeGen/AMDGPU/rename-independent-subregs.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/rename-independent-subregs.mir
rename to test/CodeGen/AMDGPU/rename-independent-subregs.mir
diff --git a/test/CodeGen/MIR/AMDGPU/scalar-store-cache-flush.mir b/test/CodeGen/AMDGPU/scalar-store-cache-flush.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/scalar-store-cache-flush.mir
rename to test/CodeGen/AMDGPU/scalar-store-cache-flush.mir
diff --git a/test/CodeGen/MIR/AMDGPU/si-fix-sgpr-copies.mir b/test/CodeGen/AMDGPU/si-fix-sgpr-copies.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/si-fix-sgpr-copies.mir
rename to test/CodeGen/AMDGPU/si-fix-sgpr-copies.mir
diff --git a/test/CodeGen/MIR/AMDGPU/subreg-intervals.mir b/test/CodeGen/AMDGPU/subreg-intervals.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/subreg-intervals.mir
rename to test/CodeGen/AMDGPU/subreg-intervals.mir
diff --git a/test/CodeGen/MIR/AMDGPU/vccz-corrupt-bug-workaround.mir b/test/CodeGen/AMDGPU/vccz-corrupt-bug-workaround.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/vccz-corrupt-bug-workaround.mir
rename to test/CodeGen/AMDGPU/vccz-corrupt-bug-workaround.mir
diff --git a/test/CodeGen/MIR/AMDGPU/waitcnt.mir b/test/CodeGen/AMDGPU/waitcnt.mir
similarity index 100%
rename from test/CodeGen/MIR/AMDGPU/waitcnt.mir
rename to test/CodeGen/AMDGPU/waitcnt.mir
diff --git a/test/CodeGen/MIR/ARM/imm-peephole-arm.mir b/test/CodeGen/ARM/imm-peephole-arm.mir
similarity index 100%
rename from test/CodeGen/MIR/ARM/imm-peephole-arm.mir
rename to test/CodeGen/ARM/imm-peephole-arm.mir
diff --git a/test/CodeGen/MIR/ARM/imm-peephole-thumb.mir b/test/CodeGen/ARM/imm-peephole-thumb.mir
similarity index 100%
rename from test/CodeGen/MIR/ARM/imm-peephole-thumb.mir
rename to test/CodeGen/ARM/imm-peephole-thumb.mir
diff --git a/test/CodeGen/MIR/Hexagon/anti-dep-partial.mir b/test/CodeGen/Hexagon/anti-dep-partial.mir
similarity index 100%
rename from test/CodeGen/MIR/Hexagon/anti-dep-partial.mir
rename to test/CodeGen/Hexagon/anti-dep-partial.mir
diff --git a/test/CodeGen/MIR/Lanai/peephole-compare.mir b/test/CodeGen/Lanai/peephole-compare.mir
similarity index 100%
rename from test/CodeGen/MIR/Lanai/peephole-compare.mir
rename to test/CodeGen/Lanai/peephole-compare.mir
diff --git a/test/CodeGen/MIR/Lanai/lit.local.cfg b/test/CodeGen/MIR/Lanai/lit.local.cfg
deleted file mode 100644
index f1b8b4f4e21f..000000000000
--- a/test/CodeGen/MIR/Lanai/lit.local.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-if not 'Lanai' in config.root.targets:
-    config.unsupported = True