diff --git a/src/test/ui/auxiliary/rmeta-meta.rs b/src/test/ui/rmeta/auxiliary/rmeta-meta.rs
similarity index 100%
rename from src/test/ui/auxiliary/rmeta-meta.rs
rename to src/test/ui/rmeta/auxiliary/rmeta-meta.rs
diff --git a/src/test/ui/auxiliary/rmeta-rlib-rpass.rs b/src/test/ui/rmeta/auxiliary/rmeta-rlib-rpass.rs
similarity index 100%
rename from src/test/ui/auxiliary/rmeta-rlib-rpass.rs
rename to src/test/ui/rmeta/auxiliary/rmeta-rlib-rpass.rs
diff --git a/src/test/ui/auxiliary/rmeta-rlib.rs b/src/test/ui/rmeta/auxiliary/rmeta-rlib.rs
similarity index 100%
rename from src/test/ui/auxiliary/rmeta-rlib.rs
rename to src/test/ui/rmeta/auxiliary/rmeta-rlib.rs
diff --git a/src/test/ui/auxiliary/rmeta-rmeta.rs b/src/test/ui/rmeta/auxiliary/rmeta-rmeta.rs
similarity index 100%
rename from src/test/ui/auxiliary/rmeta-rmeta.rs
rename to src/test/ui/rmeta/auxiliary/rmeta-rmeta.rs
diff --git a/src/test/ui/rmeta-lib-pass.rs b/src/test/ui/rmeta/rmeta-lib-pass.rs
similarity index 100%
rename from src/test/ui/rmeta-lib-pass.rs
rename to src/test/ui/rmeta/rmeta-lib-pass.rs
diff --git a/src/test/ui/rmeta-pass.rs b/src/test/ui/rmeta/rmeta-pass.rs
similarity index 100%
rename from src/test/ui/rmeta-pass.rs
rename to src/test/ui/rmeta/rmeta-pass.rs
diff --git a/src/test/ui/rmeta-priv-warn.rs b/src/test/ui/rmeta/rmeta-priv-warn.rs
similarity index 100%
rename from src/test/ui/rmeta-priv-warn.rs
rename to src/test/ui/rmeta/rmeta-priv-warn.rs
diff --git a/src/test/ui/rmeta-rpass.rs b/src/test/ui/rmeta/rmeta-rpass.rs
similarity index 100%
rename from src/test/ui/rmeta-rpass.rs
rename to src/test/ui/rmeta/rmeta-rpass.rs
diff --git a/src/test/ui/rmeta.rs b/src/test/ui/rmeta/rmeta.rs
similarity index 100%
rename from src/test/ui/rmeta.rs
rename to src/test/ui/rmeta/rmeta.rs
diff --git a/src/test/ui/rmeta.stderr b/src/test/ui/rmeta/rmeta.stderr
similarity index 100%
rename from src/test/ui/rmeta.stderr
rename to src/test/ui/rmeta/rmeta.stderr
diff --git a/src/test/ui/rmeta_lib.rs b/src/test/ui/rmeta/rmeta_lib.rs
similarity index 100%
rename from src/test/ui/rmeta_lib.rs
rename to src/test/ui/rmeta/rmeta_lib.rs
diff --git a/src/test/ui/rmeta_lib.stderr b/src/test/ui/rmeta/rmeta_lib.stderr
similarity index 100%
rename from src/test/ui/rmeta_lib.stderr
rename to src/test/ui/rmeta/rmeta_lib.stderr
diff --git a/src/test/ui/rmeta_meta_main.rs b/src/test/ui/rmeta/rmeta_meta_main.rs
similarity index 100%
rename from src/test/ui/rmeta_meta_main.rs
rename to src/test/ui/rmeta/rmeta_meta_main.rs
diff --git a/src/test/ui/rmeta_meta_main.stderr b/src/test/ui/rmeta/rmeta_meta_main.stderr
similarity index 100%
rename from src/test/ui/rmeta_meta_main.stderr
rename to src/test/ui/rmeta/rmeta_meta_main.stderr