diff --git a/.gitignore b/.gitignore
index d7ae9e0b6ec..52c89dacb55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /target
 **/*.rs.bk
 /artifacts
+.DS_Store
diff --git a/Cargo.toml b/Cargo.toml
index a81644fd436..b275f7830a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/wasmerio/wasmer"
 publish = true
 description = "High-Performance WebAssembly JIT interpreter"
 license = "MIT"
-build = "src/build_spectests.rs"
+build = "build/mod.rs"
 include = [
     "examples/**/*",
     "src/**/*",
diff --git a/build/mod.rs b/build/mod.rs
new file mode 100644
index 00000000000..375812891c6
--- /dev/null
+++ b/build/mod.rs
@@ -0,0 +1,8 @@
+extern crate wabt;
+
+// use emtests;
+mod spectests;
+
+fn main() {
+    spectests::build();
+}
diff --git a/src/build_spectests.rs b/build/spectests.rs
similarity index 99%
rename from src/build_spectests.rs
rename to build/spectests.rs
index 2585a348f60..03cdbbe6e1d 100644
--- a/src/build_spectests.rs
+++ b/build/spectests.rs
@@ -1,8 +1,6 @@
 //! This file will run at build time to autogenerate Rust tests based on
 //! WebAssembly spec tests. It will convert the files indicated in TESTS
 //! from "/spectests/{MODULE}.wast" to "/src/spectests/{MODULE}.rs".
-extern crate wabt;
-
 use std::collections::HashMap;
 use std::env;
 use std::fs;
@@ -12,7 +10,7 @@ use wabt::wasm2wat;
 
 static ENV_VAR: &str = "WASM_GENERATE_SPECTESTS";
 
-static BANNER: &str = "// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+static BANNER: &str = "// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.\n";
 
 const TESTS: [&str; 60] = [
@@ -620,7 +618,7 @@ fn wast_to_rust(wast_filepath: &str) -> (String, i32) {
     (script_name, generator.command_no)
 }
 
-fn main() {
+pub fn build() {
     if env::var(ENV_VAR).unwrap_or("0".to_string()) != "1" {
         return;
     }
diff --git a/src/spectests/address.rs b/src/spectests/address.rs
index df6220d6d19..f9c0cde1710 100644
--- a/src/spectests/address.rs
+++ b/src/spectests/address.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/address.wast
 #![allow(
diff --git a/src/spectests/align.rs b/src/spectests/align.rs
index 9871b4740e2..2aff7cc4324 100644
--- a/src/spectests/align.rs
+++ b/src/spectests/align.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/align.wast
 #![allow(
diff --git a/src/spectests/binary.rs b/src/spectests/binary.rs
index a3a67191b7e..ca04c663c14 100644
--- a/src/spectests/binary.rs
+++ b/src/spectests/binary.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/binary.wast
 #![allow(
diff --git a/src/spectests/block.rs b/src/spectests/block.rs
index 504af70b597..4fcd46af4c3 100644
--- a/src/spectests/block.rs
+++ b/src/spectests/block.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/block.wast
 #![allow(
diff --git a/src/spectests/br.rs b/src/spectests/br.rs
index 92a3e4a18b9..9edda967c31 100644
--- a/src/spectests/br.rs
+++ b/src/spectests/br.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/br.wast
 #![allow(
diff --git a/src/spectests/br_if.rs b/src/spectests/br_if.rs
index 7073ff25745..7739729075a 100644
--- a/src/spectests/br_if.rs
+++ b/src/spectests/br_if.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/br_if.wast
 #![allow(
diff --git a/src/spectests/br_table.rs b/src/spectests/br_table.rs
index b718c087d1b..0b0f3afdeb8 100644
--- a/src/spectests/br_table.rs
+++ b/src/spectests/br_table.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/br_table.wast
 #![allow(
diff --git a/src/spectests/break_drop.rs b/src/spectests/break_drop.rs
index 3d19fa30675..25b324472d9 100644
--- a/src/spectests/break_drop.rs
+++ b/src/spectests/break_drop.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/break_drop.wast
 #![allow(
diff --git a/src/spectests/call.rs b/src/spectests/call.rs
index e5b91952fc3..d0f9fe50052 100644
--- a/src/spectests/call.rs
+++ b/src/spectests/call.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/call.wast
 #![allow(
diff --git a/src/spectests/call_indirect.rs b/src/spectests/call_indirect.rs
index faba5e494a9..f1c24dd9245 100644
--- a/src/spectests/call_indirect.rs
+++ b/src/spectests/call_indirect.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/call_indirect.wast
 #![allow(
diff --git a/src/spectests/comments.rs b/src/spectests/comments.rs
index 8e008b4660c..123fb14ec11 100644
--- a/src/spectests/comments.rs
+++ b/src/spectests/comments.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/comments.wast
 #![allow(
diff --git a/src/spectests/const_.rs b/src/spectests/const_.rs
index 6479e73342d..6e3bec88fbf 100644
--- a/src/spectests/const_.rs
+++ b/src/spectests/const_.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/const_.wast
 #![allow(
diff --git a/src/spectests/conversions.rs b/src/spectests/conversions.rs
index 542da06cf93..32220ad053e 100644
--- a/src/spectests/conversions.rs
+++ b/src/spectests/conversions.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/conversions.wast
 #![allow(
diff --git a/src/spectests/custom.rs b/src/spectests/custom.rs
index 08d146b9c8e..264a03452b4 100644
--- a/src/spectests/custom.rs
+++ b/src/spectests/custom.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/custom.wast
 #![allow(
diff --git a/src/spectests/data.rs b/src/spectests/data.rs
index c2ca849dc13..ce27e601470 100644
--- a/src/spectests/data.rs
+++ b/src/spectests/data.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/data.wast
 #![allow(
diff --git a/src/spectests/elem.rs b/src/spectests/elem.rs
index d86f9da95ea..abc4c5f6bc7 100644
--- a/src/spectests/elem.rs
+++ b/src/spectests/elem.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/elem.wast
 #![allow(
diff --git a/src/spectests/endianness.rs b/src/spectests/endianness.rs
index 1ceb0bcbfe4..50a3ddaa3af 100644
--- a/src/spectests/endianness.rs
+++ b/src/spectests/endianness.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/endianness.wast
 #![allow(
diff --git a/src/spectests/exports.rs b/src/spectests/exports.rs
index 645c7d987d9..b28e8307b0f 100644
--- a/src/spectests/exports.rs
+++ b/src/spectests/exports.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/exports.wast
 #![allow(
diff --git a/src/spectests/f32_.rs b/src/spectests/f32_.rs
index 36efeb21eda..b906f93a9ce 100644
--- a/src/spectests/f32_.rs
+++ b/src/spectests/f32_.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f32_.wast
 #![allow(
diff --git a/src/spectests/f32_bitwise.rs b/src/spectests/f32_bitwise.rs
index 702c184e36d..954b7e190de 100644
--- a/src/spectests/f32_bitwise.rs
+++ b/src/spectests/f32_bitwise.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f32_bitwise.wast
 #![allow(
diff --git a/src/spectests/f32_cmp.rs b/src/spectests/f32_cmp.rs
index 8241c1a55da..c1a7275d584 100644
--- a/src/spectests/f32_cmp.rs
+++ b/src/spectests/f32_cmp.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f32_cmp.wast
 #![allow(
diff --git a/src/spectests/f64_.rs b/src/spectests/f64_.rs
index cf27fda2b68..fcc9eeb85aa 100644
--- a/src/spectests/f64_.rs
+++ b/src/spectests/f64_.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f64_.wast
 #![allow(
diff --git a/src/spectests/f64_bitwise.rs b/src/spectests/f64_bitwise.rs
index ca956436629..fc6018fad43 100644
--- a/src/spectests/f64_bitwise.rs
+++ b/src/spectests/f64_bitwise.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f64_bitwise.wast
 #![allow(
diff --git a/src/spectests/f64_cmp.rs b/src/spectests/f64_cmp.rs
index 7b641805220..371bf864961 100644
--- a/src/spectests/f64_cmp.rs
+++ b/src/spectests/f64_cmp.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/f64_cmp.wast
 #![allow(
diff --git a/src/spectests/fac.rs b/src/spectests/fac.rs
index b2c0a5eb04a..d06ce7e163a 100644
--- a/src/spectests/fac.rs
+++ b/src/spectests/fac.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/fac.wast
 #![allow(
diff --git a/src/spectests/float_exprs.rs b/src/spectests/float_exprs.rs
index bb902ed9cc8..84d4c14770d 100644
--- a/src/spectests/float_exprs.rs
+++ b/src/spectests/float_exprs.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/float_exprs.wast
 #![allow(
diff --git a/src/spectests/float_literals.rs b/src/spectests/float_literals.rs
index efac00cc617..d1f9452acf0 100644
--- a/src/spectests/float_literals.rs
+++ b/src/spectests/float_literals.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/float_literals.wast
 #![allow(
diff --git a/src/spectests/float_memory.rs b/src/spectests/float_memory.rs
index 7c9fb027022..4c1f27e6d41 100644
--- a/src/spectests/float_memory.rs
+++ b/src/spectests/float_memory.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/float_memory.wast
 #![allow(
diff --git a/src/spectests/float_misc.rs b/src/spectests/float_misc.rs
index a50ca1126da..09b044aad06 100644
--- a/src/spectests/float_misc.rs
+++ b/src/spectests/float_misc.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/float_misc.wast
 #![allow(
diff --git a/src/spectests/forward.rs b/src/spectests/forward.rs
index 738f65c7779..9dfec44879e 100644
--- a/src/spectests/forward.rs
+++ b/src/spectests/forward.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/forward.wast
 #![allow(
diff --git a/src/spectests/func.rs b/src/spectests/func.rs
index cde2fa49aae..3715d927c07 100644
--- a/src/spectests/func.rs
+++ b/src/spectests/func.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/func.wast
 #![allow(
diff --git a/src/spectests/func_ptrs.rs b/src/spectests/func_ptrs.rs
index e37dfea9ae9..919ef971ff1 100644
--- a/src/spectests/func_ptrs.rs
+++ b/src/spectests/func_ptrs.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/func_ptrs.wast
 #![allow(
diff --git a/src/spectests/get_local.rs b/src/spectests/get_local.rs
index 6d9eb8b13b8..48247b6b2b6 100644
--- a/src/spectests/get_local.rs
+++ b/src/spectests/get_local.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/get_local.wast
 #![allow(
diff --git a/src/spectests/globals.rs b/src/spectests/globals.rs
index 4c1b74a6e21..bfe3a7a95bb 100644
--- a/src/spectests/globals.rs
+++ b/src/spectests/globals.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/globals.wast
 #![allow(
diff --git a/src/spectests/i32_.rs b/src/spectests/i32_.rs
index 35547e7cd50..8f9678a50f8 100644
--- a/src/spectests/i32_.rs
+++ b/src/spectests/i32_.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/i32_.wast
 #![allow(
diff --git a/src/spectests/i64_.rs b/src/spectests/i64_.rs
index 080d100a398..946b5caaf9e 100644
--- a/src/spectests/i64_.rs
+++ b/src/spectests/i64_.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/i64_.wast
 #![allow(
diff --git a/src/spectests/if_.rs b/src/spectests/if_.rs
index 4980bf5c669..2dd27a68fa4 100644
--- a/src/spectests/if_.rs
+++ b/src/spectests/if_.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/if_.wast
 #![allow(
diff --git a/src/spectests/int_exprs.rs b/src/spectests/int_exprs.rs
index 4bebe1ecb18..824efec29f5 100644
--- a/src/spectests/int_exprs.rs
+++ b/src/spectests/int_exprs.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/int_exprs.wast
 #![allow(
diff --git a/src/spectests/int_literals.rs b/src/spectests/int_literals.rs
index e9fa531bd85..2f31c541dfd 100644
--- a/src/spectests/int_literals.rs
+++ b/src/spectests/int_literals.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/int_literals.wast
 #![allow(
diff --git a/src/spectests/labels.rs b/src/spectests/labels.rs
index d394f8e8d15..6e3d947ef62 100644
--- a/src/spectests/labels.rs
+++ b/src/spectests/labels.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/labels.wast
 #![allow(
diff --git a/src/spectests/left_to_right.rs b/src/spectests/left_to_right.rs
index 98ae51a7f20..94260ce7a8f 100644
--- a/src/spectests/left_to_right.rs
+++ b/src/spectests/left_to_right.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/left_to_right.wast
 #![allow(
diff --git a/src/spectests/loop_.rs b/src/spectests/loop_.rs
index 6afb1bbe0bc..55dafeab016 100644
--- a/src/spectests/loop_.rs
+++ b/src/spectests/loop_.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/loop_.wast
 #![allow(
diff --git a/src/spectests/memory.rs b/src/spectests/memory.rs
index fa2f6326c38..9b031590547 100644
--- a/src/spectests/memory.rs
+++ b/src/spectests/memory.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/memory.wast
 #![allow(
diff --git a/src/spectests/memory_grow.rs b/src/spectests/memory_grow.rs
index 37c42c0bae4..d20ba76a89a 100644
--- a/src/spectests/memory_grow.rs
+++ b/src/spectests/memory_grow.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/memory_grow.wast
 #![allow(
diff --git a/src/spectests/memory_redundancy.rs b/src/spectests/memory_redundancy.rs
index c3a73d2d8b5..c1b4cfa3f09 100644
--- a/src/spectests/memory_redundancy.rs
+++ b/src/spectests/memory_redundancy.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/memory_redundancy.wast
 #![allow(
diff --git a/src/spectests/memory_trap.rs b/src/spectests/memory_trap.rs
index a5ad4639303..6886c9ee172 100644
--- a/src/spectests/memory_trap.rs
+++ b/src/spectests/memory_trap.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/memory_trap.wast
 #![allow(
diff --git a/src/spectests/mod.rs b/src/spectests/mod.rs
index 0f953c3bfd9..f694cdea695 100644
--- a/src/spectests/mod.rs
+++ b/src/spectests/mod.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 
 // The _common module is not autogenerated, as it provides common functions for the spectests
diff --git a/src/spectests/nop.rs b/src/spectests/nop.rs
index cf9f842e95c..3a1a50dff98 100644
--- a/src/spectests/nop.rs
+++ b/src/spectests/nop.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/nop.wast
 #![allow(
diff --git a/src/spectests/return_.rs b/src/spectests/return_.rs
index be19df4ee3f..fb9e1092f21 100644
--- a/src/spectests/return_.rs
+++ b/src/spectests/return_.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/return_.wast
 #![allow(
diff --git a/src/spectests/select.rs b/src/spectests/select.rs
index 004947e82fc..87214acdd6b 100644
--- a/src/spectests/select.rs
+++ b/src/spectests/select.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/select.wast
 #![allow(
diff --git a/src/spectests/set_local.rs b/src/spectests/set_local.rs
index ccfab95e570..145a3d39078 100644
--- a/src/spectests/set_local.rs
+++ b/src/spectests/set_local.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/set_local.wast
 #![allow(
diff --git a/src/spectests/stack.rs b/src/spectests/stack.rs
index 6cdf8f04ed8..f986464bd25 100644
--- a/src/spectests/stack.rs
+++ b/src/spectests/stack.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/stack.wast
 #![allow(
diff --git a/src/spectests/start.rs b/src/spectests/start.rs
index 518019929d9..718aefa87b7 100644
--- a/src/spectests/start.rs
+++ b/src/spectests/start.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/start.wast
 #![allow(
diff --git a/src/spectests/store_retval.rs b/src/spectests/store_retval.rs
index be04b1bc854..8a82a5a3282 100644
--- a/src/spectests/store_retval.rs
+++ b/src/spectests/store_retval.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/store_retval.wast
 #![allow(
diff --git a/src/spectests/switch.rs b/src/spectests/switch.rs
index 464d80aec11..7db229542dd 100644
--- a/src/spectests/switch.rs
+++ b/src/spectests/switch.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/switch.wast
 #![allow(
diff --git a/src/spectests/tee_local.rs b/src/spectests/tee_local.rs
index 105ebb37739..b8fe178a6af 100644
--- a/src/spectests/tee_local.rs
+++ b/src/spectests/tee_local.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/tee_local.wast
 #![allow(
diff --git a/src/spectests/token.rs b/src/spectests/token.rs
index 55a02803fb0..75c14daa85a 100644
--- a/src/spectests/token.rs
+++ b/src/spectests/token.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/token.wast
 #![allow(
diff --git a/src/spectests/traps.rs b/src/spectests/traps.rs
index d7fa1b65365..f7e9bf03edc 100644
--- a/src/spectests/traps.rs
+++ b/src/spectests/traps.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/traps.wast
 #![allow(
diff --git a/src/spectests/typecheck.rs b/src/spectests/typecheck.rs
index a6e1946e660..26baeec119f 100644
--- a/src/spectests/typecheck.rs
+++ b/src/spectests/typecheck.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/typecheck.wast
 #![allow(
diff --git a/src/spectests/types.rs b/src/spectests/types.rs
index 3a2750b1c0e..281e8e4c80c 100644
--- a/src/spectests/types.rs
+++ b/src/spectests/types.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/types.wast
 #![allow(
diff --git a/src/spectests/unwind.rs b/src/spectests/unwind.rs
index 5987db0bc4a..e5605a4a4e2 100644
--- a/src/spectests/unwind.rs
+++ b/src/spectests/unwind.rs
@@ -1,4 +1,4 @@
-// Rust test file autogenerated with cargo build (src/build_spectests.rs).
+// Rust test file autogenerated with cargo build (build/spectests.rs).
 // Please do NOT modify it by hand, as it will be reseted on next build.
 // Test based on spectests/unwind.wast
 #![allow(