diff --git a/llvm/test/CodeGen/WebAssembly/call-indirect.ll b/llvm/test/CodeGen/WebAssembly/call-indirect.ll
index b88d0965a0d530..55a654f358490b 100644
--- a/llvm/test/CodeGen/WebAssembly/call-indirect.ll
+++ b/llvm/test/CodeGen/WebAssembly/call-indirect.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -asm-verbose=false -O2 | FileCheck --check-prefixes=CHECK,NOREF %s
+; RUN: llc < %s -asm-verbose=false -mattr=-reference-types -O2 | FileCheck --check-prefixes=CHECK,NOREF %s
 ; RUN: llc < %s -asm-verbose=false -mattr=+reference-types -O2 | FileCheck --check-prefixes=CHECK,REF %s
 ; RUN: llc < %s -asm-verbose=false -O2 --filetype=obj | obj2yaml | FileCheck --check-prefix=OBJ %s
 
diff --git a/llvm/test/CodeGen/WebAssembly/function-pointer64.ll b/llvm/test/CodeGen/WebAssembly/function-pointer64.ll
index 7f98d3e648bd4a..d5d10b00824fe0 100644
--- a/llvm/test/CodeGen/WebAssembly/function-pointer64.ll
+++ b/llvm/test/CodeGen/WebAssembly/function-pointer64.ll
@@ -1,6 +1,6 @@
-; RUN: llc < %s -asm-verbose=false -O2 | FileCheck %s
+; RUN: llc < %s -asm-verbose=false -mattr=-reference-types -O2 | FileCheck %s
 ; RUN: llc < %s -asm-verbose=false -mattr=+reference-types -O2 | FileCheck --check-prefix=REF %s
-; RUN: llc < %s -asm-verbose=false -O2 --filetype=obj | obj2yaml | FileCheck --check-prefix=YAML %s
+; RUN: llc < %s -asm-verbose=false -mattr=-reference-types -O2 --filetype=obj | obj2yaml | FileCheck --check-prefix=YAML %s
 
 ; This tests pointer features that may codegen differently in wasm64.
 
diff --git a/llvm/test/CodeGen/WebAssembly/reg-stackify.ll b/llvm/test/CodeGen/WebAssembly/reg-stackify.ll
index f9845d4857c412..f1466a48e7394f 100644
--- a/llvm/test/CodeGen/WebAssembly/reg-stackify.ll
+++ b/llvm/test/CodeGen/WebAssembly/reg-stackify.ll
@@ -649,7 +649,7 @@ define i32 @stackpointer_dependency(ptr readnone) {
 ; NOREGS-NEXT: local.tee 0
 ; NOREGS:      i32.load  0
 ; NOREGS-NEXT: i32.load  0
-; NOREGS-NEXT: call_indirect (i32, i32) -> (i32)
+; NOREGS-NEXT: call_indirect __indirect_function_table, (i32, i32) -> (i32)
 %class.call_indirect = type { ptr }
 define i32 @call_indirect_stackify(ptr %objptr, i32 %arg) {
   %obj = load ptr, ptr %objptr
diff --git a/llvm/test/CodeGen/WebAssembly/swiftcc.ll b/llvm/test/CodeGen/WebAssembly/swiftcc.ll
index e0f67b02c05c6e..0c5c3d8bbb0ffe 100644
--- a/llvm/test/CodeGen/WebAssembly/swiftcc.ll
+++ b/llvm/test/CodeGen/WebAssembly/swiftcc.ll
@@ -19,21 +19,21 @@ define swiftcc void @bar() {
   call swiftcc void @foo(i32 1, i32 2)
 
 ; REG: call_indirect   $pop{{[0-9]+}}, $pop{{[0-9]+}}, $pop{{[0-9]+}}, $pop{{[0-9]+}}
-; CHECK: call_indirect   (i32, i32, i32, i32) -> ()
+; CHECK: call_indirect __indirect_function_table, (i32, i32, i32, i32) -> ()
   call swiftcc void %1(i32 1, i32 2)
 
 ; REG: call_indirect   $pop{{[0-9]+}}, $pop{{[0-9]+}}, $pop{{[0-9]+}}, $pop{{[0-9]+}}
-; CHECK: call_indirect   (i32, i32, i32, i32) -> ()
+; CHECK: call_indirect __indirect_function_table, (i32, i32, i32, i32) -> ()
   call swiftcc void %1(i32 1, i32 2, i32 swiftself 3)
 
   %err = alloca swifterror ptr, align 4
 
 ; REG: call_indirect   $pop{{[0-9]+}}, $pop{{[0-9]+}}, $pop{{[0-9]+}}, $pop{{[0-9]+}}
-; CHECK: call_indirect   (i32, i32, i32, i32) -> ()
+; CHECK: call_indirect __indirect_function_table, (i32, i32, i32, i32) -> ()
   call swiftcc void %1(i32 1, i32 2, ptr swifterror %err)
 
 ; REG: call_indirect   $pop{{[0-9]+}}, $pop{{[0-9]+}}, $pop{{[0-9]+}}, $pop{{[0-9]+}}
-; CHECK: call_indirect   (i32, i32, i32, i32) -> ()
+; CHECK: call_indirect __indirect_function_table, (i32, i32, i32, i32) -> ()
   call swiftcc void %1(i32 1, i32 2, i32 swiftself 3, ptr swifterror %err)
 
   ret void
diff --git a/llvm/test/MC/WebAssembly/function-alias.ll b/llvm/test/MC/WebAssembly/function-alias.ll
index 6722d18fe7cc8b..036cd7d06e063a 100644
--- a/llvm/test/MC/WebAssembly/function-alias.ll
+++ b/llvm/test/MC/WebAssembly/function-alias.ll
@@ -1,4 +1,4 @@
-; RUN: llc -filetype=obj %s -o - | llvm-readobj --symbols - | FileCheck %s
+; RUN: llc -filetype=obj %s -mattr=-reference-types -o - | llvm-readobj --symbols - | FileCheck %s
 ; RUN: llc -filetype=obj %s -mattr=+reference-types -o - | llvm-readobj --symbols - | FileCheck --check-prefix=REF %s
 
 target triple = "wasm32-unknown-unknown-wasm"
diff --git a/llvm/test/MC/WebAssembly/no-dead-strip.ll b/llvm/test/MC/WebAssembly/no-dead-strip.ll
index 6b3f090d9cab8f..3125dcf453225f 100644
--- a/llvm/test/MC/WebAssembly/no-dead-strip.ll
+++ b/llvm/test/MC/WebAssembly/no-dead-strip.ll
@@ -50,6 +50,11 @@ entry:
 ; CHECK-NEXT:        Segment:         3
 ; CHECK-NEXT:        Offset:          8
 ; CHECK-NEXT:        Size:            8
+; CHECK-NEXT:      - Index:           5
+; CHECK-NEXT:        Kind:            TABLE
+; CHECK-NEXT:        Name:            __indirect_function_table
+; CHECK-NEXT:        Flags:           [ UNDEFINED, NO_STRIP ]
+; CHECK-NEXT:        Table:           0
 ; CHECK-NEXT:    SegmentInfo:
 ; CHECK-NEXT:      - Index:           0
 ; CHECK-NEXT:        Name:            .data.gv0