diff --git a/crates/wiggle/test-helpers/examples/tracing.rs b/crates/wiggle/test-helpers/examples/tracing.rs
index 0f06e18509..fe2dd51d8e 100644
--- a/crates/wiggle/test-helpers/examples/tracing.rs
+++ b/crates/wiggle/test-helpers/examples/tracing.rs
@@ -15,15 +15,14 @@ pub enum RichError {
 // trivial function.
 wiggle::from_witx!({
 witx_literal: "
-(typename $errno (enum u8 $ok $invalid_arg $picket_line))
-(typename $s (struct (field $f1 (@witx usize)) (field $f2 (@witx pointer u8))))
-(typename $t (struct (field $f1 u32) (field $f2 f32)))
+(typename $errno (enum (@witx tag u8) $ok $invalid_arg $picket_line))
+(typename $s (record (field $f1 (@witx usize)) (field $f2 (@witx pointer u8))))
+(typename $t (record (field $f1 u32) (field $f2 f32)))
 (module $one_error_conversion
   (@interface func (export \"foo\")
      (param $strike u32)
      (param $s $s)
-     (result $err $errno)
-     (result $t $t)))
+     (result $err (expected $t (error $errno)))))
     ",
     ctx: WasiCtx,
     errors: { errno => RichError },
@@ -90,7 +89,7 @@ fn main() {
     let r0 = one_error_conversion::foo(&ctx, &host_memory, 0, 0, 8);
     assert_eq!(
         r0,
-        Ok(i32::from(types::Errno::Ok)),
+        Ok(types::Errno::Ok as i32),
         "Expected return value for strike=0"
     );
     assert!(ctx.log.borrow().is_empty(), "No error log for strike=0");
@@ -99,7 +98,7 @@ fn main() {
     let r1 = one_error_conversion::foo(&ctx, &host_memory, 1, 0, 8);
     assert_eq!(
         r1,
-        Ok(i32::from(types::Errno::PicketLine)),
+        Ok(types::Errno::PicketLine as i32),
         "Expected return value for strike=1"
     );
     assert_eq!(
@@ -112,7 +111,7 @@ fn main() {
     let r2 = one_error_conversion::foo(&ctx, &host_memory, 2, 0, 8);
     assert_eq!(
         r2,
-        Ok(i32::from(types::Errno::InvalidArg)),
+        Ok(types::Errno::InvalidArg as i32),
         "Expected return value for strike=2"
     );
     assert_eq!(