diff --git a/tests/ui/README.md b/tests/ui/README.md
index 7900af9d8c9b..a9f1c61c6b66 100644
--- a/tests/ui/README.md
+++ b/tests/ui/README.md
@@ -939,12 +939,6 @@ Something is missing which could be added to fix (e.g. suggestions).
 
 **FIXME**: this is way too vague, tests should be rehomed.
 
-## `tests/ui/missing_non_modrs_mod/`
-
-This directory is a small tree of `mod` dependencies, but the root, `foo.rs`, is looking for a file which does not exist. The test checks that the error is reported at the top-level module.
-
-**FIXME**: Merge with `tests/ui/modules/`.
-
 ## `tests/ui/missing-trait-bounds/`
 
 Tests for checking missing trait bounds, and their diagnostics.
diff --git a/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs
deleted file mode 100644
index b1ac0756688f..000000000000
--- a/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod foo;
-fn main() {}
-
-//~? ERROR file not found for module `missing`
diff --git a/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs
deleted file mode 100644
index 987fe1166d74..000000000000
--- a/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod foo_inline;
-fn main() {}
-
-//~? ERROR file not found for module `missing`
diff --git a/tests/ui/missing_non_modrs_mod/foo.rs b/tests/ui/modules/missing_mod.rs
similarity index 62%
rename from tests/ui/missing_non_modrs_mod/foo.rs
rename to tests/ui/modules/missing_mod.rs
index afdc5e39b84d..5fc98998aca0 100644
--- a/tests/ui/missing_non_modrs_mod/foo.rs
+++ b/tests/ui/modules/missing_mod.rs
@@ -1,3 +1,3 @@
 //@ ignore-auxiliary (used by `./missing_non_modrs_mod.rs`)
-
+// looking for a file which does not exist.
 mod missing;
diff --git a/tests/ui/missing_non_modrs_mod/foo_inline.rs b/tests/ui/modules/missing_mod_inline.rs
similarity index 69%
rename from tests/ui/missing_non_modrs_mod/foo_inline.rs
rename to tests/ui/modules/missing_mod_inline.rs
index ed6d3a49101d..a6adcf942716 100644
--- a/tests/ui/missing_non_modrs_mod/foo_inline.rs
+++ b/tests/ui/modules/missing_mod_inline.rs
@@ -1,5 +1,5 @@
 //@ ignore-auxiliary (used by `./missing_non_modrs_mod_inline.rs`)
-
+// looking for a file which does not exist.
 mod inline {
     mod missing;
 }
diff --git a/tests/ui/modules/missing_non_modrs_mod.rs b/tests/ui/modules/missing_non_modrs_mod.rs
new file mode 100644
index 000000000000..1ed3318ed5c9
--- /dev/null
+++ b/tests/ui/modules/missing_non_modrs_mod.rs
@@ -0,0 +1,5 @@
+//! Tests the error reporting when a declared module file is missing.
+mod missing_mod;
+fn main() {}
+
+//~? ERROR file not found for module `missing`
diff --git a/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr b/tests/ui/modules/missing_non_modrs_mod.stderr
similarity index 67%
rename from tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr
rename to tests/ui/modules/missing_non_modrs_mod.stderr
index c084fbf00c26..4717e35fdea1 100644
--- a/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr
+++ b/tests/ui/modules/missing_non_modrs_mod.stderr
@@ -1,10 +1,10 @@
 error[E0583]: file not found for module `missing`
-  --> $DIR/foo.rs:3:1
+  --> $DIR/missing_mod.rs:3:1
    |
 LL | mod missing;
    | ^^^^^^^^^^^^
    |
-   = help: to create the module `missing`, create file "$DIR/foo/missing.rs" or "$DIR/foo/missing/mod.rs"
+   = help: to create the module `missing`, create file "$DIR/missing_mod/missing.rs" or "$DIR/missing_mod/missing/mod.rs"
    = note: if there is a `mod missing` elsewhere in the crate already, import it with `use crate::...` instead
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/modules/missing_non_modrs_mod_inline.rs b/tests/ui/modules/missing_non_modrs_mod_inline.rs
new file mode 100644
index 000000000000..f652519c7658
--- /dev/null
+++ b/tests/ui/modules/missing_non_modrs_mod_inline.rs
@@ -0,0 +1,5 @@
+//! Tests the error reporting when a declared module file is missing.
+mod missing_mod_inline;
+fn main() {}
+
+//~? ERROR file not found for module `missing`
diff --git a/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr b/tests/ui/modules/missing_non_modrs_mod_inline.stderr
similarity index 63%
rename from tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr
rename to tests/ui/modules/missing_non_modrs_mod_inline.stderr
index 86193dd26e04..dfbba6bce8ef 100644
--- a/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr
+++ b/tests/ui/modules/missing_non_modrs_mod_inline.stderr
@@ -1,10 +1,10 @@
 error[E0583]: file not found for module `missing`
-  --> $DIR/foo_inline.rs:4:5
+  --> $DIR/missing_mod_inline.rs:4:5
    |
 LL |     mod missing;
    |     ^^^^^^^^^^^^
    |
-   = help: to create the module `missing`, create file "$DIR/foo_inline/inline/missing.rs" or "$DIR/foo_inline/inline/missing/mod.rs"
+   = help: to create the module `missing`, create file "$DIR/missing_mod_inline/inline/missing.rs" or "$DIR/missing_mod_inline/inline/missing/mod.rs"
    = note: if there is a `mod missing` elsewhere in the crate already, import it with `use crate::...` instead
 
 error: aborting due to 1 previous error