diff --git a/src/test/ui/command-argv0-debug.rs b/src/test/ui/command/command-argv0-debug.rs
similarity index 100%
rename from src/test/ui/command-argv0-debug.rs
rename to src/test/ui/command/command-argv0-debug.rs
diff --git a/src/test/ui/command-argv0.rs b/src/test/ui/command/command-argv0.rs
similarity index 100%
rename from src/test/ui/command-argv0.rs
rename to src/test/ui/command/command-argv0.rs
diff --git a/src/test/ui/command-exec.rs b/src/test/ui/command/command-exec.rs
similarity index 100%
rename from src/test/ui/command-exec.rs
rename to src/test/ui/command/command-exec.rs
diff --git a/src/test/ui/command-pre-exec.rs b/src/test/ui/command/command-pre-exec.rs
similarity index 100%
rename from src/test/ui/command-pre-exec.rs
rename to src/test/ui/command/command-pre-exec.rs
diff --git a/src/test/ui/command-uid-gid.rs b/src/test/ui/command/command-uid-gid.rs
similarity index 100%
rename from src/test/ui/command-uid-gid.rs
rename to src/test/ui/command/command-uid-gid.rs