diff --git a/build.rs b/build.rs
index dc598c2b434..47cdcf25dbb 100644
--- a/build.rs
+++ b/build.rs
@@ -106,6 +106,6 @@ fn main() -> anyhow::Result<()> {
     // `rustfmt` if it's installed.
     let output = out_dir.join("generated_tests.rs");
     fs::write(&output, out.buffer)?;
-    drop(Command::new("rustfmt").arg(&output).status());
+    Command::new("rustfmt").arg(&output).status();
     Ok(())
 }
diff --git a/tests/ignores.txt b/tests/ignores.txt
index c5bb68ef0b4..0c582039dd7 100644
--- a/tests/ignores.txt
+++ b/tests/ignores.txt
@@ -22,7 +22,7 @@ cranelift::spec::linking on windows
 cranelift::spec::memory_grow on windows
 cranelift::spec::memory_trap on windows
 cranelift::spec::select on windows
-cranelift::spec::stack-guard-page on windows
+cranelift::spec::skip_stack_guard_page on windows
 cranelift::spec::traps on windows
 cranelift::spec::unreachable on windows
 cranelift::spec::unwind on windows
@@ -47,7 +47,7 @@ llvm::spec::linking
 
 # LLVM AArch64
 llvm::spec::atomic on aarch64 # Out of range relocations.
-llvm::spec::stack-guard-page on aarch64 # Uncaught SIGSEGV only on release builds
+llvm::spec::skip_stack_guard_page on aarch64 # Uncaught SIGSEGV only on release builds
 
 # LLVM Windows
 llvm::spec::address on windows
diff --git a/tests/test-generator/src/lib.rs b/tests/test-generator/src/lib.rs
index 3ec3ee79a62..1b927d5a152 100644
--- a/tests/test-generator/src/lib.rs
+++ b/tests/test-generator/src/lib.rs
@@ -51,6 +51,9 @@ pub fn build_ignores_from_textfile(path: PathBuf) -> anyhow::Result<Ignores> {
         } else {
             line
         };
+
+        let line = line.trim().to_string();
+
         // If the lines contains ` on ` it means the test should be ignored
         // on that platform
         let (line, target) = if line.contains(" on ") {
@@ -62,8 +65,6 @@ pub fn build_ignores_from_textfile(path: PathBuf) -> anyhow::Result<Ignores> {
         } else {
             (line, None)
         };
-
-        let line = line.trim().to_string();
         if line.len() == 0 {
             continue;
         }