19 files changed, 52 insertions, 52 deletions
diff --git a/test/parse/expr/bad-br-bad-depth.txt b/test/parse/expr/bad-br-bad-depth.txt
new file mode 100644
index 00000000..3cbd6990
--- /dev/null
+++ b/test/parse/expr/bad-br-bad-depth.txt
@@ -0,0 +1,9 @@
+;;; ERROR: 1
+(module
+  (func
+    (label   ;; 1
+      (label ;; 0
+        (br 2)))))
+(;; STDERR ;;;
+parse/expr/bad-br-bad-depth.txt:6:13: label variable out of range (max 2)
+;;; STDERR ;;)
diff --git a/test/parse/expr/bad-br-defined-later.txt b/test/parse/expr/bad-br-defined-later.txt
new file mode 100644
index 00000000..194f52b7
--- /dev/null
+++ b/test/parse/expr/bad-br-defined-later.txt
@@ -0,0 +1,7 @@
+;;; ERROR: 1
+(module (func
+  (br 0)
+  (label (nop))))
+(;; STDERR ;;;
+parse/expr/bad-br-defined-later.txt:3:7: label variable out of range (max 0)
+;;; STDERR ;;)
diff --git a/test/parse/expr/bad-br-name-undefined.txt b/test/parse/expr/bad-br-name-undefined.txt
new file mode 100644
index 00000000..7641ad2a
--- /dev/null
+++ b/test/parse/expr/bad-br-name-undefined.txt
@@ -0,0 +1,5 @@
+;;; ERROR: 1
+(module (func (br $n)))
+(;; STDERR ;;;
+parse/expr/bad-br-name-undefined.txt:2:19: undefined label variable "$n"
+;;; STDERR ;;)
diff --git a/test/parse/expr/bad-br-name.txt b/test/parse/expr/bad-br-name.txt
new file mode 100644
index 00000000..92e8a203
--- /dev/null
+++ b/test/parse/expr/bad-br-name.txt
@@ -0,0 +1,5 @@
+;;; ERROR: 1
+(module (func (label $foo (br foo))))
+(;; STDERR ;;;
+parse/expr/bad-br-name.txt:2:31: unexpected token "foo"
+;;; STDERR ;;)
diff --git a/test/parse/expr/bad-br-no-label.txt b/test/parse/expr/bad-br-no-label.txt
new file mode 100644
index 00000000..b6bfe3a4
--- /dev/null
+++ b/test/parse/expr/bad-br-no-label.txt
@@ -0,0 +1,5 @@
+;;; ERROR: 1
+(module (func (br)))
+(;; STDERR ;;;
+parse/expr/bad-br-no-label.txt:2:16: label variable out of range (max 0)
+;;; STDERR ;;)
diff --git a/test/parse/expr/bad-br-undefined.txt b/test/parse/expr/bad-br-undefined.txt
new file mode 100644
index 00000000..71729b52
--- /dev/null
+++ b/test/parse/expr/bad-br-undefined.txt
@@ -0,0 +1,5 @@
+;;; ERROR: 1
+(module (func (br 0)))
+(;; STDERR ;;;
+parse/expr/bad-br-undefined.txt:2:19: label variable out of range (max 0)
+;;; STDERR ;;)
diff --git a/test/parse/expr/bad-break-bad-depth.txt b/test/parse/expr/bad-break-bad-depth.txt
deleted file mode 100644
index 1a666eb8..00000000
--- a/test/parse/expr/bad-break-bad-depth.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-;;; ERROR: 1
-(module
-  (func
-    (label   ;; 1
-      (label ;; 0
-        (break 2)))))
-(;; STDERR ;;;
-parse/expr/bad-break-bad-depth.txt:6:16: label variable out of range (max 2)
-;;; STDERR ;;)
diff --git a/test/parse/expr/bad-break-defined-later.txt b/test/parse/expr/bad-break-defined-later.txt
deleted file mode 100644
index c1879bde..00000000
--- a/test/parse/expr/bad-break-defined-later.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-;;; ERROR: 1
-(module (func
-  (break 0)
-  (label (nop))))
-(;; STDERR ;;;
-parse/expr/bad-break-defined-later.txt:3:10: label variable out of range (max 0)
-;;; STDERR ;;)
diff --git a/test/parse/expr/bad-break-name-undefined.txt b/test/parse/expr/bad-break-name-undefined.txt
deleted file mode 100644
index c02125ee..00000000
--- a/test/parse/expr/bad-break-name-undefined.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-;;; ERROR: 1
-(module (func (break $n)))
-(;; STDERR ;;;
-parse/expr/bad-break-name-undefined.txt:2:22: undefined label variable "$n"
-;;; STDERR ;;)
diff --git a/test/parse/expr/bad-break-name.txt b/test/parse/expr/bad-break-name.txt
deleted file mode 100644
index 1f8eed9e..00000000
--- a/test/parse/expr/bad-break-name.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-;;; ERROR: 1
-(module (func (label $foo (break foo))))
-(;; STDERR ;;;
-parse/expr/bad-break-name.txt:2:34: unexpected token "foo"
-;;; STDERR ;;)
diff --git a/test/parse/expr/bad-break-no-label.txt b/test/parse/expr/bad-break-no-label.txt
deleted file mode 100644
index 52261560..00000000
--- a/test/parse/expr/bad-break-no-label.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-;;; ERROR: 1
-(module (func (break)))
-(;; STDERR ;;;
-parse/expr/bad-break-no-label.txt:2:16: label variable out of range (max 0)
-;;; STDERR ;;)
diff --git a/test/parse/expr/bad-break-undefined.txt b/test/parse/expr/bad-break-undefined.txt
deleted file mode 100644
index 7b9e61e2..00000000
--- a/test/parse/expr/bad-break-undefined.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-;;; ERROR: 1
-(module (func (break 0)))
-(;; STDERR ;;;
-parse/expr/bad-break-undefined.txt:2:22: label variable out of range (max 0)
-;;; STDERR ;;)
diff --git a/test/parse/expr/break-block.txt b/test/parse/expr/br-block.txt
index 40f9892b..013a78b6 100644
--- a/test/parse/expr/break-block.txt
+++ b/test/parse/expr/br-block.txt
@@ -1,6 +1,6 @@
 (module
   (func
     (block $exit1
-      (break 0))
+      (br 0))
     (block $exit2
-      (break $exit2))))
+      (br $exit2))))
diff --git a/test/parse/expr/br-loop.txt b/test/parse/expr/br-loop.txt
new file mode 100644
index 00000000..72f92942
--- /dev/null
+++ b/test/parse/expr/br-loop.txt
@@ -0,0 +1,7 @@
+(module
+  (func
+    (loop $exit
+      (br $exit))
+    (loop $outer $inner
+      (br $inner)
+      (br $outer))))
diff --git a/test/parse/expr/break-named.txt b/test/parse/expr/br-named.txt
index 829f0ac2..2b3bb92b 100644
--- a/test/parse/expr/break-named.txt
+++ b/test/parse/expr/br-named.txt
@@ -1,3 +1,3 @@
 (module (func
   (label $foo
-    (break $foo))))
+    (br $foo))))
diff --git a/test/parse/expr/break-loop.txt b/test/parse/expr/break-loop.txt
deleted file mode 100644
index 9bc1fc49..00000000
--- a/test/parse/expr/break-loop.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-(module
-  (func
-    (loop $exit
-      (break $exit))
-    (loop $outer $inner
-      (break $inner)
-      (break $outer))))
diff --git a/test/parse/expr/break.txt b/test/parse/expr/break.txt
index 0b03258e..f1760455 100644
--- a/test/parse/expr/break.txt
+++ b/test/parse/expr/break.txt
@@ -1,3 +1,3 @@
 (module (func
   (label
-    (break 0))))
+    (br 0))))
diff --git a/test/parse/expr/expr-br.txt b/test/parse/expr/expr-br.txt
new file mode 100644
index 00000000..f2f0d2b6
--- /dev/null
+++ b/test/parse/expr/expr-br.txt
@@ -0,0 +1,5 @@
+(module
+  (func (result i32)
+    (block $exit
+      (br (i32.const 0))
+      (br 0 (i32.const 0)))))
diff --git a/test/parse/expr/expr-break.txt b/test/parse/expr/expr-break.txt
deleted file mode 100644
index 44d83ace..00000000
--- a/test/parse/expr/expr-break.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-(module
-  (func (result i32)
-    (block $exit
-      (break (i32.const 0))
-      (break 0 (i32.const 0)))))