diff --git a/clang/test/Cilk/cilksan-O0.c b/clang/test/Cilk/cilksan-O0.c
index f238c76c82ad..b97c86e01a88 100644
--- a/clang/test/Cilk/cilksan-O0.c
+++ b/clang/test/Cilk/cilksan-O0.c
@@ -12,19 +12,19 @@ int c = 2;
 
 void addA() {
   // CHECK: define void @addA()
-  // CHECK: __csan_func_entry(i64 {{.+}}, i8* {{.+}}, i64 0)
+  // CHECK: __csan_func_entry(i64 {{.+}}, i8* {{.+}}, i8* {{.+}}, i64 0)
   a = c;
 }
 
 void addB() {
   // CHECK: define void @addB()
-  // CHECK: __csan_func_entry(i64 {{.+}}, i8* {{.+}}, i64 0)
+  // CHECK: __csan_func_entry(i64 {{.+}}, i8* {{.+}}, i8* {{.+}}, i64 0)
   b = a;
 }
 
 void foo() {
   // CHECK: define void @foo()
-  // CHECK: __csan_func_entry(i64 {{.+}}, i8* {{.+}}, i64 3)
+  // CHECK: __csan_func_entry(i64 {{.+}}, i8* {{.+}}, i8* {{.+}}, i64 257)
   _Cilk_spawn addA();
   addB();
   _Cilk_sync;
@@ -32,7 +32,7 @@ void foo() {
 
 int main() {
   // CHECK: define i32 @main()
-  // CHECK: __csan_func_entry(i64 {{.+}}, i8* {{.+}}, i64 0)
+  // CHECK: __csan_func_entry(i64 {{.+}}, i8* {{.+}}, i8* {{.+}}, i64 0)
   foo();
   return 0;
 }
diff --git a/llvm/test/Transforms/Tapir/stealable-attribute.ll b/llvm/test/Transforms/Tapir/stealable-attribute.ll
index 7d4bca556284..ae22ee7328e3 100644
--- a/llvm/test/Transforms/Tapir/stealable-attribute.ll
+++ b/llvm/test/Transforms/Tapir/stealable-attribute.ll
@@ -1,16 +1,16 @@
-; Check that Tapir lowering to the Cilk or CilkR targets will decorate
+; Check that Tapir lowering to the Cilk or OpenCilk targets will decorate
 ; functions that can be stolen with the "stealable" attribute.
 ;
 ; RUN: opt < %s -loop-spawning-ti -simplifycfg -instcombine -tapir2target -tapir-target=cilk -simplifycfg -instcombine -S | FileCheck %s --check-prefix=LOWERING
-; RUN: opt < %s -loop-spawning-ti -simplifycfg -instcombine -tapir2target -tapir-target=cilkr -simplifycfg -instcombine -S | FileCheck %s --check-prefix=LOWERING
-; RUN: opt < %s -passes='loop-spawning,function(simplify-cfg,instcombine),tapir2target,function(simplify-cfg,instcombine)' -tapir-target=cilkr -instcombine -S | FileCheck %s --check-prefix=LOWERING
+; RUN: opt < %s -loop-spawning-ti -simplifycfg -instcombine -tapir2target -tapir-target=opencilk -simplifycfg -instcombine -S | FileCheck %s --check-prefix=LOWERING
+; RUN: opt < %s -passes='loop-spawning,function(simplify-cfg,instcombine),tapir2target,function(simplify-cfg,instcombine)' -tapir-target=opencilk -instcombine -S | FileCheck %s --check-prefix=LOWERING
 ;
 ; Check that the X86 assembly produced for stealable functions does
 ; not index stack variables using %rsp.
 ;
 ; RUN: opt < %s -loop-spawning-ti -simplifycfg -instcombine -tapir2target -tapir-target=cilk -simplifycfg -instcombine | llc -O3 -mtriple=x86_64-unknown-linux-gnu | FileCheck %s --check-prefix=ASM
-; RUN: opt < %s -loop-spawning-ti -simplifycfg -instcombine -tapir2target -tapir-target=cilkr -simplifycfg -instcombine | llc -O3 -mtriple=x86_64-unknown-linux-gnu | FileCheck %s --check-prefix=ASM
-; RUN: opt < %s -passes='loop-spawning,function(simplify-cfg,instcombine),tapir2target,function(simplify-cfg,instcombine)' -tapir-target=cilkr | llc -O3 -mtriple=x86_64-unknown-linux-gnu | FileCheck %s --check-prefix=ASM
+; RUN: opt < %s -loop-spawning-ti -simplifycfg -instcombine -tapir2target -tapir-target=opencilk -simplifycfg -instcombine | llc -O3 -mtriple=x86_64-unknown-linux-gnu | FileCheck %s --check-prefix=ASM
+; RUN: opt < %s -passes='loop-spawning,function(simplify-cfg,instcombine),tapir2target,function(simplify-cfg,instcombine)' -tapir-target=opencilk | llc -O3 -mtriple=x86_64-unknown-linux-gnu | FileCheck %s --check-prefix=ASM
 
 %class._point3d = type { double, double, double }
 %struct.vertex.29 = type { i32, %class._point3d, [1 x %struct.vertex.29*] }