diff --git a/tests/rustdoc/primitive.rs b/tests/rustdoc/primitive/primitive.rs
similarity index 100%
rename from tests/rustdoc/primitive.rs
rename to tests/rustdoc/primitive/primitive.rs
diff --git a/tests/ui/impl-trait/multiple-lifetimes.rs b/tests/ui/impl-trait/multiple-lifetimes/multiple-lifetimes.rs
similarity index 100%
rename from tests/ui/impl-trait/multiple-lifetimes.rs
rename to tests/ui/impl-trait/multiple-lifetimes/multiple-lifetimes.rs
diff --git a/tests/ui/modules_and_files_visibility/mod_file_disambig_aux/compiletest-ignore-dir b/tests/ui/modules_and_files_visibility/mod_file_disambig_aux/compiletest-ignore-dir
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/tests/ui/non_modrs_mods_and_inline_mods/x/y/z/compiletest-ignore-dir b/tests/ui/non_modrs_mods_and_inline_mods/x/y/z/compiletest-ignore-dir
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/tests/ui/use/use-mod.rs b/tests/ui/use/use-mod/use-mod.rs
similarity index 100%
rename from tests/ui/use/use-mod.rs
rename to tests/ui/use/use-mod/use-mod.rs
diff --git a/tests/ui/use/use-mod.stderr b/tests/ui/use/use-mod/use-mod.stderr
similarity index 100%
rename from tests/ui/use/use-mod.stderr
rename to tests/ui/use/use-mod/use-mod.stderr
diff --git a/tests/ui/use.rs b/tests/ui/use/use.rs
similarity index 100%
rename from tests/ui/use.rs
rename to tests/ui/use/use.rs