diff --git a/tests/ui/parallel-rustc/issue-111528.rs b/tests/ui/parallel-rustc/cache-after-waiting-issue-111528.rs
similarity index 100%
rename from tests/ui/parallel-rustc/issue-111528.rs
rename to tests/ui/parallel-rustc/cache-after-waiting-issue-111528.rs
diff --git a/tests/ui/parallel-rustc/issue-111528.stderr b/tests/ui/parallel-rustc/cache-after-waiting-issue-111528.stderr
similarity index 69%
rename from tests/ui/parallel-rustc/issue-111528.stderr
rename to tests/ui/parallel-rustc/cache-after-waiting-issue-111528.stderr
index 48327943ffc6d..7963165e31b0a 100644
--- a/tests/ui/parallel-rustc/issue-111528.stderr
+++ b/tests/ui/parallel-rustc/cache-after-waiting-issue-111528.stderr
@@ -1,5 +1,5 @@
 error: symbol `fail` is already defined
-  --> $DIR/issue-111528.rs:12:1
+  --> $DIR/cache-after-waiting-issue-111528.rs:12:1
    |
 LL | pub fn b() {
    | ^^^^^^^^^^
diff --git a/tests/ui/parallel-rustc/issue-118205-2.rs b/tests/ui/parallel-rustc/export-symbols-deadlock-issue-118205-2.rs
similarity index 100%
rename from tests/ui/parallel-rustc/issue-118205-2.rs
rename to tests/ui/parallel-rustc/export-symbols-deadlock-issue-118205-2.rs
diff --git a/tests/ui/parallel-rustc/issue-118205.rs b/tests/ui/parallel-rustc/export-symbols-deadlock-issue-118205.rs
similarity index 100%
rename from tests/ui/parallel-rustc/issue-118205.rs
rename to tests/ui/parallel-rustc/export-symbols-deadlock-issue-118205.rs
diff --git a/tests/ui/parallel-rustc/issue-94654.rs b/tests/ui/parallel-rustc/issue-94654.rs
deleted file mode 100644
index 0edfd2a2d6d50..0000000000000
--- a/tests/ui/parallel-rustc/issue-94654.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// compile-flags: -Z threads=16
-
-use std::collections::BTreeSet;
-
-#[derive(Hash)]
-pub enum ElemDerived {
-//~^ ERROR E0072
-//~| ERROR E0391
-    A(ElemDerived)
-}
-
-pub enum Elem {
-    Derived(ElemDerived)
-}
-
-pub struct Set(BTreeSet<Elem>);
-
-impl Set {
-    pub fn into_iter(self) -> impl Iterator<Item = Elem> {
-        self.0.into_iter()
-    }
-}
-
-fn main() {}
diff --git a/tests/ui/parallel-rustc/issue-94654.stderr b/tests/ui/parallel-rustc/issue-94654.stderr
deleted file mode 100644
index 89e5be64f9be5..0000000000000
--- a/tests/ui/parallel-rustc/issue-94654.stderr
+++ /dev/null
@@ -1,32 +0,0 @@
-error[E0072]: recursive type `ElemDerived` has infinite size
-  --> $DIR/issue-94654.rs:6:1
-   |
-LL | pub enum ElemDerived {
-   | ^^^^^^^^^^^^^^^^^^^^
-...
-LL |     A(ElemDerived)
-   |       ----------- recursive without indirection
-   |
-help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to break the cycle
-   |
-LL |     A(Box<ElemDerived>)
-   |       ++++           +
-
-error[E0391]: cycle detected when computing drop-check constraints for `ElemDerived`
-  --> $DIR/issue-94654.rs:6:1
-   |
-LL | pub enum ElemDerived {
-   | ^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: ...which immediately requires computing drop-check constraints for `ElemDerived` again
-note: cycle used when computing drop-check constraints for `Elem`
-  --> $DIR/issue-94654.rs:12:1
-   |
-LL | pub enum Elem {
-   | ^^^^^^^^^^^^^
-   = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0072, E0391.
-For more information about an error, try `rustc --explain E0072`.
diff --git a/tests/ui/parallel-rustc/issue-111520.rs b/tests/ui/parallel-rustc/read-stolen-value-issue-111520.rs
similarity index 100%
rename from tests/ui/parallel-rustc/issue-111520.rs
rename to tests/ui/parallel-rustc/read-stolen-value-issue-111520.rs