6 files changed, 11 insertions, 5 deletions
diff --git a/test/parse/expr/bad-const-v128-nat-expected.txt b/test/parse/expr/bad-const-v128-nat-expected.txt
index 7ee4d755..aa5dae36 100644
--- a/test/parse/expr/bad-const-v128-nat-expected.txt
+++ b/test/parse/expr/bad-const-v128-nat-expected.txt
@@ -1,14 +1,15 @@
 ;;; ERROR: 1
+;;; TOOL: wat2wasm
 ;;; FLAGS: --enable-simd
 (module
   (func v128.const i32 0x12345678 -123 0x00000000 0xabcd3478))
 (module
   (func v128.const i32 0x12345678 0x9 +234 0xabcd3478))
 (;; STDERR ;;;
-out/test/parse/expr/bad-const-v128-nat-expected.txt:4:35: error: unexpected token "-123", expected an Nat literal (e.g. 123).
+out/test/parse/expr/bad-const-v128-nat-expected.txt:5:35: error: unexpected token "-123", expected an Nat literal (e.g. 123).
   (func v128.const i32 0x12345678 -123 0x00000000 0xabcd3478))
                                   ^^^^
-out/test/parse/expr/bad-const-v128-nat-expected.txt:6:39: error: unexpected token "+234", expected an Nat literal (e.g. 123).
+out/test/parse/expr/bad-const-v128-nat-expected.txt:7:39: error: unexpected token "+234", expected an Nat literal (e.g. 123).
   (func v128.const i32 0x12345678 0x9 +234 0xabcd3478))
                                       ^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/expr/bad-const-v128-nat-overflow.txt b/test/parse/expr/bad-const-v128-nat-overflow.txt
index e8423f9b..7660882e 100644
--- a/test/parse/expr/bad-const-v128-nat-overflow.txt
+++ b/test/parse/expr/bad-const-v128-nat-overflow.txt
@@ -1,9 +1,10 @@
 ;;; ERROR: 1
+;;; TOOL: wat2wasm
 ;;; FLAGS: --enable-simd
 (module
   (func v128.const i32 0x12345678 0x123 4294967296 0xabcd3478))
 (;; STDERR ;;;
-out/test/parse/expr/bad-const-v128-nat-overflow.txt:4:41: error: invalid literal "4294967296"
+out/test/parse/expr/bad-const-v128-nat-overflow.txt:5:41: error: invalid literal "4294967296"
   (func v128.const i32 0x12345678 0x123 4294967296 0xabcd3478))
                                         ^^^^^^^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/expr/bad-const-v128-type-i32-expected.txt b/test/parse/expr/bad-const-v128-type-i32-expected.txt
index 654bf851..f8bcb26b 100644
--- a/test/parse/expr/bad-const-v128-type-i32-expected.txt
+++ b/test/parse/expr/bad-const-v128-type-i32-expected.txt
@@ -1,12 +1,13 @@
 ;;; ERROR: 1
+;;; TOOL: wat2wasm
 ;;; FLAGS: --enable-simd
 (module (func v128.const 0x12345678 0x00000000 0x00000000 0xabcd3478))
 (module (func v128.const i64 0x12345678 0x00000000 0x00000000 0xabcd3478))
 (;; STDERR ;;;
-out/test/parse/expr/bad-const-v128-type-i32-expected.txt:3:26: error: Expected i32 at start of simd constant
+out/test/parse/expr/bad-const-v128-type-i32-expected.txt:4:26: error: Expected i32 at start of simd constant
 (module (func v128.const 0x12345678 0x00000000 0x00000000 0xabcd3478))
                          ^^^^^^^^^^
-out/test/parse/expr/bad-const-v128-type-i32-expected.txt:4:26: error: Expected i32 at start of simd constant
+out/test/parse/expr/bad-const-v128-type-i32-expected.txt:5:26: error: Expected i32 at start of simd constant
 (module (func v128.const i64 0x12345678 0x00000000 0x00000000 0xabcd3478))
                          ^^^
 ;;; STDERR ;;)
diff --git a/test/parse/expr/const.txt b/test/parse/expr/const.txt
index de885f39..ce13a77a 100644
--- a/test/parse/expr/const.txt
+++ b/test/parse/expr/const.txt
@@ -1,3 +1,4 @@
+;;; TOOL: wat2wasm
 ;;; FLAGS: --enable-simd
 (module
   (func
diff --git a/test/parse/expr/convert-sat.txt b/test/parse/expr/convert-sat.txt
index e2f6d07b..fa956c59 100644
--- a/test/parse/expr/convert-sat.txt
+++ b/test/parse/expr/convert-sat.txt
@@ -1,3 +1,4 @@
+;;; TOOL: wat2wasm
 ;;; FLAGS: --enable-saturating-float-to-int
 (module
   (func
diff --git a/test/parse/expr/unary-extend.txt b/test/parse/expr/unary-extend.txt
index 88791d48..24391649 100644
--- a/test/parse/expr/unary-extend.txt
+++ b/test/parse/expr/unary-extend.txt
@@ -1,3 +1,4 @@
+;;; TOOL: wat2wasm
 ;;; FLAGS: --enable-sign-extension
 (module
   (func