diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index f382502c7068..3b23fe5d8082 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -117,7 +117,6 @@ ui/associated-types/issue-44153.rs
 ui/associated-types/issue-47139-1.rs
 ui/associated-types/issue-47139-2.rs
 ui/associated-types/issue-47385.rs
-ui/associated-types/issue-47814.rs
 ui/associated-types/issue-48010.rs
 ui/associated-types/issue-48551.rs
 ui/associated-types/issue-50301.rs
@@ -406,7 +405,6 @@ ui/closures/2229_closure_analysis/match/issue-87097.rs
 ui/closures/2229_closure_analysis/match/issue-87426.rs
 ui/closures/2229_closure_analysis/match/issue-87988.rs
 ui/closures/2229_closure_analysis/match/issue-88331.rs
-ui/closures/2229_closure_analysis/migrations/issue-78720.rs
 ui/closures/2229_closure_analysis/migrations/issue-86753.rs
 ui/closures/2229_closure_analysis/migrations/issue-90024-adt-correct-subst.rs
 ui/closures/2229_closure_analysis/run_pass/issue-87378.rs
@@ -1001,7 +999,6 @@ ui/fmt/issue-86085.rs
 ui/fmt/issue-89173.rs
 ui/fmt/issue-91556.rs
 ui/fn/issue-1451.rs
-ui/fn/issue-1900.rs
 ui/fn/issue-3044.rs
 ui/fn/issue-3099.rs
 ui/fn/issue-3904.rs
diff --git a/tests/ui/closures/2229_closure_analysis/migrations/issue-78720.rs b/tests/ui/closures/2229_closure_analysis/migrations/nested-copy-drops-83176.rs
similarity index 77%
rename from tests/ui/closures/2229_closure_analysis/migrations/issue-78720.rs
rename to tests/ui/closures/2229_closure_analysis/migrations/nested-copy-drops-83176.rs
index 3e72eec4ea8c..2df8931f7ef7 100644
--- a/tests/ui/closures/2229_closure_analysis/migrations/issue-78720.rs
+++ b/tests/ui/closures/2229_closure_analysis/migrations/nested-copy-drops-83176.rs
@@ -1,3 +1,4 @@
+// Regression test for https://github.com/rust-lang/rust/issues/83176.
 //@ run-pass
 
 #![warn(rust_2021_incompatible_closure_captures)]
diff --git a/tests/ui/closures/2229_closure_analysis/migrations/issue-78720.stderr b/tests/ui/closures/2229_closure_analysis/migrations/nested-copy-drops-83176.stderr
similarity index 88%
rename from tests/ui/closures/2229_closure_analysis/migrations/issue-78720.stderr
rename to tests/ui/closures/2229_closure_analysis/migrations/nested-copy-drops-83176.stderr
index 2609e2951ec5..595173b49da6 100644
--- a/tests/ui/closures/2229_closure_analysis/migrations/issue-78720.stderr
+++ b/tests/ui/closures/2229_closure_analysis/migrations/nested-copy-drops-83176.stderr
@@ -1,5 +1,5 @@
 warning: irrefutable `if let` pattern
-  --> $DIR/issue-78720.rs:7:8
+  --> $DIR/nested-copy-drops-83176.rs:8:8
    |
 LL |     if let a = "" {
    |        ^^^^^^^^^^
diff --git a/tests/ui/impl-trait/rpit/unit-impl-default-36379.rs b/tests/ui/impl-trait/rpit/unit-impl-default-36379.rs
new file mode 100644
index 000000000000..43c93065739d
--- /dev/null
+++ b/tests/ui/impl-trait/rpit/unit-impl-default-36379.rs
@@ -0,0 +1,6 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/36379
+//@ check-pass
+
+fn _test() -> impl Default { }
+
+fn main() {}
diff --git a/tests/ui/issues/issue-36379.rs b/tests/ui/issues/issue-36379.rs
deleted file mode 100644
index 6e275b03a702..000000000000
--- a/tests/ui/issues/issue-36379.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//@ check-pass
-
-fn _test() -> impl Default { }
-
-fn main() {}