diff --git a/build_system/src/test.rs b/build_system/src/test.rs
index 36d72512dfd..a4db2fdebef 100644
--- a/build_system/src/test.rs
+++ b/build_system/src/test.rs
@@ -919,10 +919,9 @@ fn should_remove_test(file_path: &Path) -> Result<bool, String> {
             continue;
         }
         if [
-            "// error-pattern:",
-            "// @error-pattern:",
-            "// build-fail",
-            "// run-fail",
+            "//@ error-pattern:",
+            "//@ build-fail",
+            "//@ run-fail",
             "-Cllvm-args",
             "//~",
             "thread",
@@ -1016,6 +1015,8 @@ fn file_handling(file_path: &Path) -> Result<(), String> {
     // Tests generating errors.
     remove_file(&rust_path.join("tests/ui/consts/issue-94675.rs"))?;
     remove_file(&rust_path.join("tests/ui/mir/mir_heavy_promoted.rs"))?;
+    remove_file(&rust_path.join("tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.rs"))?;
+    remove_file(&rust_path.join("tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.rs"))?;
 
     walk_dir(rust_path.join("tests/ui"), dir_handling, file_handling)?;
 
diff --git a/tests/failing-lto-tests.txt b/tests/failing-lto-tests.txt
index 8de45ae0f28..6e1ed99c6f7 100644
--- a/tests/failing-lto-tests.txt
+++ b/tests/failing-lto-tests.txt
@@ -21,7 +21,6 @@ tests/ui/fmt/format-args-capture-issue-106408.rs
 tests/ui/fmt/indoc-issue-106408.rs
 tests/ui/hygiene/issue-77523-def-site-async-await.rs
 tests/ui/inherent-impls-overlap-check/no-overlap.rs
-tests/ui/annotate-snippet/multispan.rs
 tests/ui/enum-discriminant/issue-46519.rs
 tests/ui/issues/issue-45731.rs
 tests/ui/lint/test-allow-dead-extern-static-no-warning.rs
@@ -29,9 +28,5 @@ tests/ui/macros/macro-comma-behavior-rpass.rs
 tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
 tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
 tests/ui/macros/stringify.rs
-tests/ui/panics/test-panic.rs
-tests/ui/panics/test-should-fail-bad-message.rs
-tests/ui/panics/test-should-panic-bad-message.rs
-tests/ui/panics/test-should-panic-no-message.rs
 tests/ui/reexport-test-harness-main.rs
 tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test.rs
diff --git a/tests/failing-ui-tests.txt b/tests/failing-ui-tests.txt
index b9ad7ef33cf..d13562f8bb0 100644
--- a/tests/failing-ui-tests.txt
+++ b/tests/failing-ui-tests.txt
@@ -69,41 +69,8 @@ tests/ui/async-await/deep-futures-are-freeze.rs
 tests/ui/closures/capture-unsized-by-ref.rs
 tests/ui/coroutine/resume-after-return.rs
 tests/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
-tests/ui/limits/issue-17913.rs
-tests/ui/limits/issue-55878.rs
-tests/ui/linkage-attr/common-linkage-non-zero-init.rs
-tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs
-tests/ui/numbers-arithmetic/divide-by-zero.rs
-tests/ui/numbers-arithmetic/mod-zero.rs
-tests/ui/numbers-arithmetic/overflowing-neg-nonzero.rs
-tests/ui/optimization-remark.rs
-tests/ui/panic-handler/panic-handler-std.rs
-tests/ui/panic-runtime/abort-link-to-unwind-dylib.rs
-tests/ui/panic-runtime/need-unwind-got-abort.rs
-tests/ui/panics/issue-47429-short-backtraces.rs
-tests/ui/panics/panic-in-cleanup.rs
-tests/ui/panics/panic-in-ffi.rs
-tests/ui/panics/runtime-switch.rs
-tests/ui/panics/short-ice-remove-middle-frames-2.rs
-tests/ui/panics/short-ice-remove-middle-frames.rs
-tests/ui/precondition-checks/out-of-bounds-get-unchecked.rs
 tests/ui/simd/masked-load-store.rs
 tests/ui/simd/repr_packed.rs
-tests/ui/type_length_limit.rs
 tests/ui/async-await/in-trait/dont-project-to-specializable-projection.rs
-tests/ui/async-await/issues/issue-65419/issue-65419-coroutine-resume-after-completion.rs
-tests/ui/c-variadic/issue-86053-1.rs
-tests/ui/const-ptr/out_of_bounds_read.rs
-tests/ui/consts/const_unsafe_unreachable_ub.rs
-tests/ui/consts/miri_unleashed/drop.rs
-tests/ui/consts/timeout.rs
 tests/ui/consts/try-operator.rs
-tests/ui/coroutine/coroutine-resume-after-panic.rs
 tests/ui/coroutine/unwind-abort-mix.rs
-tests/ui/duplicate/dupe-symbols-7.rs
-tests/ui/duplicate/dupe-symbols-8.rs
-tests/ui/hygiene/panic-location.rs
-tests/ui/invalid/issue-114435-layout-type-err.rs
-tests/ui/invalid-compile-flags/invalid-llvm-passes.rs
-tests/ui/lto/issue-105637.rs
-tests/ui/lto/lto-duplicate-symbols.rs