8 files changed, 12 insertions, 9 deletions
diff --git a/test/parse/module/bad-elem-redefinition.txt b/test/parse/module/bad-elem-redefinition.txt
index 1b589617..56f055f7 100644
--- a/test/parse/module/bad-elem-redefinition.txt
+++ b/test/parse/module/bad-elem-redefinition.txt
@@ -7,7 +7,10 @@
   (func))
 
 (;; STDERR ;;;
-out/test/parse/module/bad-elem-redefinition.txt:6:4: error: redefinition of elem "$elem"
+out/test/parse/module/bad-elem-redefinition.txt:5:23: error: unexpected token 0, expected ).
   (elem $elem funcref 0)
-   ^^^^
+                      ^
+out/test/parse/module/bad-elem-redefinition.txt:6:23: error: unexpected token 0, expected ).
+  (elem $elem funcref 0)
+                      ^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-export-func-undefined.txt b/test/parse/module/bad-export-func-undefined.txt
index 4b346522..94047757 100644
--- a/test/parse/module/bad-export-func-undefined.txt
+++ b/test/parse/module/bad-export-func-undefined.txt
@@ -2,7 +2,7 @@
 ;;; ERROR: 1
 (module (export "foo" (func 0)))
 (;; STDERR ;;;
-out/test/parse/module/bad-export-func-undefined.txt:3:29: error: function variable out of range (max 0)
+out/test/parse/module/bad-export-func-undefined.txt:3:29: error: function variable out of range: 0 (max 4294967295)
 (module (export "foo" (func 0)))
                             ^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-export-global-undefined.txt b/test/parse/module/bad-export-global-undefined.txt
index 7a977002..ec046880 100644
--- a/test/parse/module/bad-export-global-undefined.txt
+++ b/test/parse/module/bad-export-global-undefined.txt
@@ -2,7 +2,7 @@
 ;;; ERROR: 1
 (module (export "foo" (global 0)))
 (;; STDERR ;;;
-out/test/parse/module/bad-export-global-undefined.txt:3:31: error: global variable out of range (max 0)
+out/test/parse/module/bad-export-global-undefined.txt:3:31: error: global variable out of range: 0 (max 4294967295)
 (module (export "foo" (global 0)))
                               ^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-export-memory-undefined.txt b/test/parse/module/bad-export-memory-undefined.txt
index a591a217..7e8fe212 100644
--- a/test/parse/module/bad-export-memory-undefined.txt
+++ b/test/parse/module/bad-export-memory-undefined.txt
@@ -3,7 +3,7 @@
 (module
   (export "mem" (memory 0)))
 (;; STDERR ;;;
-out/test/parse/module/bad-export-memory-undefined.txt:4:25: error: memory variable out of range (max 0)
+out/test/parse/module/bad-export-memory-undefined.txt:4:25: error: memory variable out of range: 0 (max 4294967295)
   (export "mem" (memory 0)))
                         ^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-export-table-undefined.txt b/test/parse/module/bad-export-table-undefined.txt
index 7b40c2ba..cb913820 100644
--- a/test/parse/module/bad-export-table-undefined.txt
+++ b/test/parse/module/bad-export-table-undefined.txt
@@ -2,7 +2,7 @@
 ;;; ERROR: 1
 (module (export "foo" (table 0)))
 (;; STDERR ;;;
-out/test/parse/module/bad-export-table-undefined.txt:3:30: error: table variable out of range (max 0)
+out/test/parse/module/bad-export-table-undefined.txt:3:30: error: table variable out of range: 0 (max 4294967295)
 (module (export "foo" (table 0)))
                              ^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-global-invalid-getglobal.txt b/test/parse/module/bad-global-invalid-getglobal.txt
index 90d00191..f7ce5129 100644
--- a/test/parse/module/bad-global-invalid-getglobal.txt
+++ b/test/parse/module/bad-global-invalid-getglobal.txt
@@ -3,7 +3,7 @@
 (module
   (global i32 (get_global 1)))
 (;; STDERR ;;;
-out/test/parse/module/bad-global-invalid-getglobal.txt:4:27: error: global variable out of range (max 1)
+out/test/parse/module/bad-global-invalid-getglobal.txt:4:27: error: global variable out of range: 1 (max 0)
   (global i32 (get_global 1)))
                           ^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-start-too-many.txt b/test/parse/module/bad-start-too-many.txt
index 8f4016e3..8223e5d4 100644
--- a/test/parse/module/bad-start-too-many.txt
+++ b/test/parse/module/bad-start-too-many.txt
@@ -6,7 +6,7 @@
   (func)
   (func))
 (;; STDERR ;;;
-out/test/parse/module/bad-start-too-many.txt:5:4: error: only one start function allowed
+out/test/parse/module/bad-start-too-many.txt:5:4: error: multiple start sections
   (start 1)
    ^^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-table-invalid-function.txt b/test/parse/module/bad-table-invalid-function.txt
index 8ff7f01e..562d8c0c 100644
--- a/test/parse/module/bad-table-invalid-function.txt
+++ b/test/parse/module/bad-table-invalid-function.txt
@@ -5,7 +5,7 @@
   (func $f)
   (elem (i32.const 0) $f 1))
 (;; STDERR ;;;
-out/test/parse/module/bad-table-invalid-function.txt:6:26: error: function variable out of range (max 1)
+out/test/parse/module/bad-table-invalid-function.txt:6:26: error: function variable out of range: 1 (max 0)
   (elem (i32.const 0) $f 1))
                          ^
 ;;; STDERR ;;)