diff --git a/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr b/tests/ui/cli/branch-protection-missing-pac-ret.BADFLAGS.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr
rename to tests/ui/cli/branch-protection-missing-pac-ret.BADFLAGS.stderr
diff --git a/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGSPC.stderr b/tests/ui/cli/branch-protection-missing-pac-ret.BADFLAGSPC.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGSPC.stderr
rename to tests/ui/cli/branch-protection-missing-pac-ret.BADFLAGSPC.stderr
diff --git a/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr b/tests/ui/cli/branch-protection-missing-pac-ret.BADTARGET.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr
rename to tests/ui/cli/branch-protection-missing-pac-ret.BADTARGET.stderr
diff --git a/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs b/tests/ui/cli/branch-protection-missing-pac-ret.rs
similarity index 100%
rename from tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs
rename to tests/ui/cli/branch-protection-missing-pac-ret.rs
diff --git a/tests/ui/invalid-compile-flags/codegen-option-without-group.rs b/tests/ui/cli/codegen-option-without-group.rs
similarity index 100%
rename from tests/ui/invalid-compile-flags/codegen-option-without-group.rs
rename to tests/ui/cli/codegen-option-without-group.rs
diff --git a/tests/ui/invalid-compile-flags/codegen-option-without-group.stderr b/tests/ui/cli/codegen-option-without-group.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/codegen-option-without-group.stderr
rename to tests/ui/cli/codegen-option-without-group.stderr
diff --git a/tests/ui/invalid-compile-flags/debug-option-without-group.rs b/tests/ui/cli/debug-option-without-group.rs
similarity index 100%
rename from tests/ui/invalid-compile-flags/debug-option-without-group.rs
rename to tests/ui/cli/debug-option-without-group.rs
diff --git a/tests/ui/invalid-compile-flags/debug-option-without-group.stderr b/tests/ui/cli/debug-option-without-group.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/debug-option-without-group.stderr
rename to tests/ui/cli/debug-option-without-group.stderr
diff --git a/tests/ui/extern-flag/auxiliary/panic_handler.rs b/tests/ui/cli/extern-flag/auxiliary/panic_handler.rs
similarity index 100%
rename from tests/ui/extern-flag/auxiliary/panic_handler.rs
rename to tests/ui/cli/extern-flag/auxiliary/panic_handler.rs
diff --git a/tests/ui/extern-flag/auxiliary/somedep.rs b/tests/ui/cli/extern-flag/auxiliary/somedep.rs
similarity index 100%
rename from tests/ui/extern-flag/auxiliary/somedep.rs
rename to tests/ui/cli/extern-flag/auxiliary/somedep.rs
diff --git a/tests/ui/extern-flag/empty-extern-arg.rs b/tests/ui/cli/extern-flag/empty-extern-arg.rs
similarity index 100%
rename from tests/ui/extern-flag/empty-extern-arg.rs
rename to tests/ui/cli/extern-flag/empty-extern-arg.rs
diff --git a/tests/ui/extern-flag/empty-extern-arg.stderr b/tests/ui/cli/extern-flag/empty-extern-arg.stderr
similarity index 100%
rename from tests/ui/extern-flag/empty-extern-arg.stderr
rename to tests/ui/cli/extern-flag/empty-extern-arg.stderr
diff --git a/tests/ui/extern-flag/force-extern.rs b/tests/ui/cli/extern-flag/force-extern.rs
similarity index 100%
rename from tests/ui/extern-flag/force-extern.rs
rename to tests/ui/cli/extern-flag/force-extern.rs
diff --git a/tests/ui/extern-flag/invalid-crate-name-dashed.rs b/tests/ui/cli/extern-flag/invalid-crate-name-dashed.rs
similarity index 100%
rename from tests/ui/extern-flag/invalid-crate-name-dashed.rs
rename to tests/ui/cli/extern-flag/invalid-crate-name-dashed.rs
diff --git a/tests/ui/extern-flag/invalid-crate-name-dashed.stderr b/tests/ui/cli/extern-flag/invalid-crate-name-dashed.stderr
similarity index 100%
rename from tests/ui/extern-flag/invalid-crate-name-dashed.stderr
rename to tests/ui/cli/extern-flag/invalid-crate-name-dashed.stderr
diff --git a/tests/ui/extern-flag/invalid-crate-name-non-ascii.rs b/tests/ui/cli/extern-flag/invalid-crate-name-non-ascii.rs
similarity index 100%
rename from tests/ui/extern-flag/invalid-crate-name-non-ascii.rs
rename to tests/ui/cli/extern-flag/invalid-crate-name-non-ascii.rs
diff --git a/tests/ui/extern-flag/invalid-crate-name-non-ascii.stderr b/tests/ui/cli/extern-flag/invalid-crate-name-non-ascii.stderr
similarity index 100%
rename from tests/ui/extern-flag/invalid-crate-name-non-ascii.stderr
rename to tests/ui/cli/extern-flag/invalid-crate-name-non-ascii.stderr
diff --git a/tests/ui/extern-flag/invalid-crate-name.rs b/tests/ui/cli/extern-flag/invalid-crate-name.rs
similarity index 100%
rename from tests/ui/extern-flag/invalid-crate-name.rs
rename to tests/ui/cli/extern-flag/invalid-crate-name.rs
diff --git a/tests/ui/extern-flag/invalid-crate-name.stderr b/tests/ui/cli/extern-flag/invalid-crate-name.stderr
similarity index 100%
rename from tests/ui/extern-flag/invalid-crate-name.stderr
rename to tests/ui/cli/extern-flag/invalid-crate-name.stderr
diff --git a/tests/ui/extern-flag/multiple-opts.rs b/tests/ui/cli/extern-flag/multiple-opts.rs
similarity index 100%
rename from tests/ui/extern-flag/multiple-opts.rs
rename to tests/ui/cli/extern-flag/multiple-opts.rs
diff --git a/tests/ui/extern-flag/multiple-opts.stderr b/tests/ui/cli/extern-flag/multiple-opts.stderr
similarity index 100%
rename from tests/ui/extern-flag/multiple-opts.stderr
rename to tests/ui/cli/extern-flag/multiple-opts.stderr
diff --git a/tests/ui/extern-flag/no-force-extern.rs b/tests/ui/cli/extern-flag/no-force-extern.rs
similarity index 100%
rename from tests/ui/extern-flag/no-force-extern.rs
rename to tests/ui/cli/extern-flag/no-force-extern.rs
diff --git a/tests/ui/extern-flag/no-nounused.rs b/tests/ui/cli/extern-flag/no-nounused.rs
similarity index 100%
rename from tests/ui/extern-flag/no-nounused.rs
rename to tests/ui/cli/extern-flag/no-nounused.rs
diff --git a/tests/ui/extern-flag/no-nounused.stderr b/tests/ui/cli/extern-flag/no-nounused.stderr
similarity index 100%
rename from tests/ui/extern-flag/no-nounused.stderr
rename to tests/ui/cli/extern-flag/no-nounused.stderr
diff --git a/tests/ui/extern-flag/noprelude-and-prelude.rs b/tests/ui/cli/extern-flag/noprelude-and-prelude.rs
similarity index 100%
rename from tests/ui/extern-flag/noprelude-and-prelude.rs
rename to tests/ui/cli/extern-flag/noprelude-and-prelude.rs
diff --git a/tests/ui/extern-flag/noprelude-resolves.rs b/tests/ui/cli/extern-flag/noprelude-resolves.rs
similarity index 100%
rename from tests/ui/extern-flag/noprelude-resolves.rs
rename to tests/ui/cli/extern-flag/noprelude-resolves.rs
diff --git a/tests/ui/extern-flag/noprelude.rs b/tests/ui/cli/extern-flag/noprelude.rs
similarity index 100%
rename from tests/ui/extern-flag/noprelude.rs
rename to tests/ui/cli/extern-flag/noprelude.rs
diff --git a/tests/ui/extern-flag/noprelude.stderr b/tests/ui/cli/extern-flag/noprelude.stderr
similarity index 100%
rename from tests/ui/extern-flag/noprelude.stderr
rename to tests/ui/cli/extern-flag/noprelude.stderr
diff --git a/tests/ui/extern-flag/nounused.rs b/tests/ui/cli/extern-flag/nounused.rs
similarity index 100%
rename from tests/ui/extern-flag/nounused.rs
rename to tests/ui/cli/extern-flag/nounused.rs
diff --git a/tests/ui/extern-flag/public-and-private.rs b/tests/ui/cli/extern-flag/public-and-private.rs
similarity index 100%
rename from tests/ui/extern-flag/public-and-private.rs
rename to tests/ui/cli/extern-flag/public-and-private.rs
diff --git a/tests/ui/extern-flag/public-and-private.stderr b/tests/ui/cli/extern-flag/public-and-private.stderr
similarity index 100%
rename from tests/ui/extern-flag/public-and-private.stderr
rename to tests/ui/cli/extern-flag/public-and-private.stderr
diff --git a/tests/ui/extern-flag/redundant-force-extern.rs b/tests/ui/cli/extern-flag/redundant-force-extern.rs
similarity index 100%
rename from tests/ui/extern-flag/redundant-force-extern.rs
rename to tests/ui/cli/extern-flag/redundant-force-extern.rs
diff --git a/tests/ui/invalid-compile-flags/fuel.rs b/tests/ui/cli/fuel.rs
similarity index 100%
rename from tests/ui/invalid-compile-flags/fuel.rs
rename to tests/ui/cli/fuel.rs
diff --git a/tests/ui/invalid-compile-flags/function-return/requires-x86-or-x86_64.aarch64.stderr b/tests/ui/cli/function-return/requires-x86-or-x86_64.aarch64.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/function-return/requires-x86-or-x86_64.aarch64.stderr
rename to tests/ui/cli/function-return/requires-x86-or-x86_64.aarch64.stderr
diff --git a/tests/ui/invalid-compile-flags/function-return/requires-x86-or-x86_64.rs b/tests/ui/cli/function-return/requires-x86-or-x86_64.rs
similarity index 100%
rename from tests/ui/invalid-compile-flags/function-return/requires-x86-or-x86_64.rs
rename to tests/ui/cli/function-return/requires-x86-or-x86_64.rs
diff --git a/tests/ui/invalid-compile-flags/function-return/thunk-extern-requires-non-large-code-model.large.stderr b/tests/ui/cli/function-return/thunk-extern-requires-non-large-code-model.large.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/function-return/thunk-extern-requires-non-large-code-model.large.stderr
rename to tests/ui/cli/function-return/thunk-extern-requires-non-large-code-model.large.stderr
diff --git a/tests/ui/invalid-compile-flags/function-return/thunk-extern-requires-non-large-code-model.rs b/tests/ui/cli/function-return/thunk-extern-requires-non-large-code-model.rs
similarity index 100%
rename from tests/ui/invalid-compile-flags/function-return/thunk-extern-requires-non-large-code-model.rs
rename to tests/ui/cli/function-return/thunk-extern-requires-non-large-code-model.rs
diff --git a/tests/ui/invalid-compile-flags/invalid-llvm-passes.rs b/tests/ui/cli/invalid-llvm-passes.rs
similarity index 100%
rename from tests/ui/invalid-compile-flags/invalid-llvm-passes.rs
rename to tests/ui/cli/invalid-llvm-passes.rs
diff --git a/tests/ui/invalid-compile-flags/invalid-llvm-passes.stderr b/tests/ui/cli/invalid-llvm-passes.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/invalid-llvm-passes.stderr
rename to tests/ui/cli/invalid-llvm-passes.stderr
diff --git a/tests/ui/command/need-crate-arg-ignore-tidy$x.rs b/tests/ui/cli/need-crate-arg-ignore-tidy$x.rs
similarity index 100%
rename from tests/ui/command/need-crate-arg-ignore-tidy$x.rs
rename to tests/ui/cli/need-crate-arg-ignore-tidy$x.rs
diff --git a/tests/ui/command/need-crate-arg-ignore-tidy$x.stderr b/tests/ui/cli/need-crate-arg-ignore-tidy$x.stderr
similarity index 100%
rename from tests/ui/command/need-crate-arg-ignore-tidy$x.stderr
rename to tests/ui/cli/need-crate-arg-ignore-tidy$x.stderr
diff --git a/tests/ui/invalid-compile-flags/print-without-arg.rs b/tests/ui/cli/print-without-arg.rs
similarity index 100%
rename from tests/ui/invalid-compile-flags/print-without-arg.rs
rename to tests/ui/cli/print-without-arg.rs
diff --git a/tests/ui/invalid-compile-flags/print-without-arg.stderr b/tests/ui/cli/print-without-arg.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/print-without-arg.stderr
rename to tests/ui/cli/print-without-arg.stderr
diff --git a/tests/ui/invalid-compile-flags/print.rs b/tests/ui/cli/print.rs
similarity index 100%
rename from tests/ui/invalid-compile-flags/print.rs
rename to tests/ui/cli/print.rs
diff --git a/tests/ui/invalid-compile-flags/print.stderr b/tests/ui/cli/print.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/print.stderr
rename to tests/ui/cli/print.stderr
diff --git a/tests/ui/invalid-compile-flags/regparm/regparm-valid-values.regparm4.stderr b/tests/ui/cli/regparm/regparm-valid-values.regparm4.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/regparm/regparm-valid-values.regparm4.stderr
rename to tests/ui/cli/regparm/regparm-valid-values.regparm4.stderr
diff --git a/tests/ui/invalid-compile-flags/regparm/regparm-valid-values.rs b/tests/ui/cli/regparm/regparm-valid-values.rs
similarity index 100%
rename from tests/ui/invalid-compile-flags/regparm/regparm-valid-values.rs
rename to tests/ui/cli/regparm/regparm-valid-values.rs
diff --git a/tests/ui/invalid-compile-flags/regparm/requires-x86.aarch64.stderr b/tests/ui/cli/regparm/requires-x86.aarch64.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/regparm/requires-x86.aarch64.stderr
rename to tests/ui/cli/regparm/requires-x86.aarch64.stderr
diff --git a/tests/ui/invalid-compile-flags/regparm/requires-x86.rs b/tests/ui/cli/regparm/requires-x86.rs
similarity index 100%
rename from tests/ui/invalid-compile-flags/regparm/requires-x86.rs
rename to tests/ui/cli/regparm/requires-x86.rs
diff --git a/tests/ui/invalid-compile-flags/regparm/requires-x86.x86_64.stderr b/tests/ui/cli/regparm/requires-x86.x86_64.stderr
similarity index 100%
rename from tests/ui/invalid-compile-flags/regparm/requires-x86.x86_64.stderr
rename to tests/ui/cli/regparm/requires-x86.x86_64.stderr