diff --git a/src/test/rustdoc-ui/commandline-argfile-badutf8.args b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.args
similarity index 100%
rename from src/test/rustdoc-ui/commandline-argfile-badutf8.args
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.args
diff --git a/src/test/rustdoc-ui/commandline-argfile-badutf8.rs b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.rs
similarity index 87%
rename from src/test/rustdoc-ui/commandline-argfile-badutf8.rs
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.rs
index e2984e3ca97ac..19e5dfb619c21 100644
--- a/src/test/rustdoc-ui/commandline-argfile-badutf8.rs
+++ b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.rs
@@ -1,6 +1,6 @@
 // Check to see if we can get parameters from an @argsfile file
 //
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-badutf8.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile/commandline-argfile-badutf8.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");
diff --git a/src/test/rustdoc-ui/commandline-argfile-badutf8.stderr b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.stderr
similarity index 100%
rename from src/test/rustdoc-ui/commandline-argfile-badutf8.stderr
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.stderr
diff --git a/src/test/ui/commandline-argfile-missing.rs b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-missing.rs
similarity index 92%
rename from src/test/ui/commandline-argfile-missing.rs
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile-missing.rs
index 5a6465bd06469..e48e74cd9eed3 100644
--- a/src/test/ui/commandline-argfile-missing.rs
+++ b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-missing.rs
@@ -2,7 +2,7 @@
 //
 // normalize-stderr-test: "os error \d+" -> "os error $$ERR"
 // normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-missing.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile/commandline-argfile-missing.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");
diff --git a/src/test/rustdoc-ui/commandline-argfile-missing.stderr b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-missing.stderr
similarity index 100%
rename from src/test/rustdoc-ui/commandline-argfile-missing.stderr
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile-missing.stderr
diff --git a/src/test/rustdoc-ui/commandline-argfile.args b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile.args
similarity index 100%
rename from src/test/rustdoc-ui/commandline-argfile.args
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile.args
diff --git a/src/test/rustdoc-ui/commandline-argfile.rs b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile.rs
similarity index 90%
rename from src/test/rustdoc-ui/commandline-argfile.rs
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile.rs
index cc8c8722c1c35..16184665d9e6d 100644
--- a/src/test/rustdoc-ui/commandline-argfile.rs
+++ b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile.rs
@@ -1,7 +1,7 @@
 // Check to see if we can get parameters from an @argsfile file
 //
 // check-pass
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile/commandline-argfile.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");
diff --git a/src/test/ui/commandline-argfile-badutf8.args b/src/test/ui/command/argfile/commandline-argfile-badutf8.args
similarity index 100%
rename from src/test/ui/commandline-argfile-badutf8.args
rename to src/test/ui/command/argfile/commandline-argfile-badutf8.args
diff --git a/src/test/ui/commandline-argfile-badutf8.rs b/src/test/ui/command/argfile/commandline-argfile-badutf8.rs
similarity index 67%
rename from src/test/ui/commandline-argfile-badutf8.rs
rename to src/test/ui/command/argfile/commandline-argfile-badutf8.rs
index e2984e3ca97ac..0e7407e2e2079 100644
--- a/src/test/ui/commandline-argfile-badutf8.rs
+++ b/src/test/ui/command/argfile/commandline-argfile-badutf8.rs
@@ -1,6 +1,6 @@
 // Check to see if we can get parameters from an @argsfile file
 //
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-badutf8.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/command/argfile/commandline-argfile-badutf8.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");
diff --git a/src/test/ui/commandline-argfile-badutf8.stderr b/src/test/ui/command/argfile/commandline-argfile-badutf8.stderr
similarity index 100%
rename from src/test/ui/commandline-argfile-badutf8.stderr
rename to src/test/ui/command/argfile/commandline-argfile-badutf8.stderr
diff --git a/src/test/rustdoc-ui/commandline-argfile-missing.rs b/src/test/ui/command/argfile/commandline-argfile-missing.rs
similarity index 79%
rename from src/test/rustdoc-ui/commandline-argfile-missing.rs
rename to src/test/ui/command/argfile/commandline-argfile-missing.rs
index 5a6465bd06469..1cdead6f8e757 100644
--- a/src/test/rustdoc-ui/commandline-argfile-missing.rs
+++ b/src/test/ui/command/argfile/commandline-argfile-missing.rs
@@ -2,7 +2,7 @@
 //
 // normalize-stderr-test: "os error \d+" -> "os error $$ERR"
 // normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-missing.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/command/argfile/commandline-argfile-missing.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");
diff --git a/src/test/ui/commandline-argfile-missing.stderr b/src/test/ui/command/argfile/commandline-argfile-missing.stderr
similarity index 100%
rename from src/test/ui/commandline-argfile-missing.stderr
rename to src/test/ui/command/argfile/commandline-argfile-missing.stderr
diff --git a/src/test/ui/commandline-argfile.args b/src/test/ui/command/argfile/commandline-argfile.args
similarity index 100%
rename from src/test/ui/commandline-argfile.args
rename to src/test/ui/command/argfile/commandline-argfile.args
diff --git a/src/test/ui/commandline-argfile.rs b/src/test/ui/command/argfile/commandline-argfile.rs
similarity index 70%
rename from src/test/ui/commandline-argfile.rs
rename to src/test/ui/command/argfile/commandline-argfile.rs
index fc1ba0c8d677d..40b8265cdecc9 100644
--- a/src/test/ui/commandline-argfile.rs
+++ b/src/test/ui/command/argfile/commandline-argfile.rs
@@ -1,7 +1,7 @@
 // Check to see if we can get parameters from an @argsfile file
 //
 // build-pass
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/command/argfile/commandline-argfile.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");
diff --git a/src/test/ui/command-line-diagnostics.rs b/src/test/ui/command/command-line-diagnostics.rs
similarity index 100%
rename from src/test/ui/command-line-diagnostics.rs
rename to src/test/ui/command/command-line-diagnostics.rs
diff --git a/src/test/ui/command-line-diagnostics.stderr b/src/test/ui/command/command-line-diagnostics.stderr
similarity index 100%
rename from src/test/ui/command-line-diagnostics.stderr
rename to src/test/ui/command/command-line-diagnostics.stderr