diff --git a/crates/wasi-common/build.rs b/crates/wasi-common/build.rs
index 1858fc5c7f..613982022b 100644
--- a/crates/wasi-common/build.rs
+++ b/crates/wasi-common/build.rs
@@ -129,8 +129,8 @@ mod wasm_tests {
         }
         writeln!(
             out,
-            "    fn {}() -> anyhow::Result<()> {{",
-            avoid_keywords(&stemstr.replace("-", "_"))
+            "    fn r#{}() -> anyhow::Result<()> {{",
+            &stemstr.replace("-", "_")
         )?;
         writeln!(out, "        setup_log();")?;
         write!(
@@ -162,18 +162,6 @@ mod wasm_tests {
         Ok(())
     }
 
-    /// Rename tests which have the same name as Rust keywords.
-    fn avoid_keywords(name: &str) -> &str {
-        match name {
-            "if" => "if_",
-            "loop" => "loop_",
-            "type" => "type_",
-            "const" => "const_",
-            "return" => "return_",
-            other => other,
-        }
-    }
-
     cfg_if::cfg_if! {
         if #[cfg(not(windows))] {
             /// Ignore tests that aren't supported yet.