4 files changed, 10 insertions, 10 deletions
diff --git a/test/lit/validation/closed-world-interface-intrinsics.wast b/test/lit/validation/closed-world-interface-intrinsics.wast
index 91133d6dc..50151b8c0 100644
--- a/test/lit/validation/closed-world-interface-intrinsics.wast
+++ b/test/lit/validation/closed-world-interface-intrinsics.wast
@@ -10,18 +10,18 @@
   ;; CHECK:      (type $struct (struct (field i32)))
   (type $struct (struct i32))
 
-  ;; CHECK:      (type $ref|$struct|_funcref_=>_none (func (param (ref $struct) funcref)))
+  ;; CHECK:      (type $1 (func (param (ref $struct) funcref)))
 
-  ;; CHECK:      (type $none_=>_none (func))
+  ;; CHECK:      (type $2 (func))
 
-  ;; CHECK:      (type $ref|$struct|_=>_none (func (param (ref $struct))))
+  ;; CHECK:      (type $3 (func (param (ref $struct))))
 
-  ;; CHECK:      (import "binaryen-intrinsics" "call.without.effects" (func $cwe (type $ref|$struct|_funcref_=>_none) (param (ref $struct) funcref)))
+  ;; CHECK:      (import "binaryen-intrinsics" "call.without.effects" (func $cwe (type $1) (param (ref $struct) funcref)))
   (import "binaryen-intrinsics" "call.without.effects" (func $cwe (param (ref $struct)) (param funcref)))
 
   ;; CHECK:      (elem declare func $func)
 
-  ;; CHECK:      (func $test (type $none_=>_none)
+  ;; CHECK:      (func $test (type $2)
   ;; CHECK-NEXT:  (call $cwe
   ;; CHECK-NEXT:   (struct.new $struct
   ;; CHECK-NEXT:    (i32.const 100)
@@ -38,7 +38,7 @@
     )
   )
 
-  ;; CHECK:      (func $func (type $ref|$struct|_=>_none) (param $ref (ref $struct))
+  ;; CHECK:      (func $func (type $3) (param $ref (ref $struct))
   ;; CHECK-NEXT:  (nop)
   ;; CHECK-NEXT: )
   (func $func (param $ref (ref $struct))
diff --git a/test/lit/validation/closed-world-interface.wast b/test/lit/validation/closed-world-interface.wast
index f6f663550..f5dd7ad46 100644
--- a/test/lit/validation/closed-world-interface.wast
+++ b/test/lit/validation/closed-world-interface.wast
@@ -17,7 +17,7 @@
 
 ;; This is referred to by the type of a function export, but is still not allowed.
 ;; CHECK:      publicly exposed type disallowed with a closed world: $struct, on
-;; CHECK-NEXT: (struct)
+;; CHECK-NEXT: (struct )
 
 (module
   (type $struct (struct))
diff --git a/test/lit/validation/eqref.wast b/test/lit/validation/eqref.wast
index 8de1e93fa..3c636592f 100644
--- a/test/lit/validation/eqref.wast
+++ b/test/lit/validation/eqref.wast
@@ -1,12 +1,12 @@
 ;; Test for eqref validating only with GC, and not just reference types, even
 ;; when only declared in a null.
 
-;; RUN: not wasm-opt --enable-reference-types %s 2>&1 | filecheck %s --check-prefix NO-GC
+;; RUN: not wasm-opt --enable-reference-types %s -o - -S 2>&1 | filecheck %s --check-prefix NO-GC
 ;; RUN:     wasm-opt --enable-reference-types --enable-gc %s -o - -S | filecheck %s --check-prefix GC
 
 ;; NO-GC: all used types should be allowed
 
-;; GC:   (func $foo (type $eqref_=>_none) (param $x eqref)
+;; GC:   (func $foo (type $0) (param $x eqref)
 
 (module
   (func $foo (param $x eqref)
diff --git a/test/lit/validation/nn-tuples.wast b/test/lit/validation/nn-tuples.wast
index 2a621face..c84dd9aab 100644
--- a/test/lit/validation/nn-tuples.wast
+++ b/test/lit/validation/nn-tuples.wast
@@ -6,7 +6,7 @@
 ;; Test for non-nullable types in tuples
 
 (module
-  ;; CHECK:      (func $foo (type $none_=>_none)
+  ;; CHECK:      (func $foo (type $0)
   ;; CHECK-NEXT:  (local $tuple ((ref any) (ref any)))
   ;; CHECK-NEXT:  (nop)
   ;; CHECK-NEXT: )