diff --git a/clang/test/CodeGenCUDASPIRV/copy-aggregate-byval.cu b/clang/test/CodeGenCUDASPIRV/copy-aggregate-byval.cu
index bceca4d4ee5d6e..2692ce4c92b288 100644
--- a/clang/test/CodeGenCUDASPIRV/copy-aggregate-byval.cu
+++ b/clang/test/CodeGenCUDASPIRV/copy-aggregate-byval.cu
@@ -1,12 +1,12 @@
 // Tests CUDA kernel arguments get copied by value when targeting SPIR-V, even with
 // destructor, copy constructor or move constructor defined by user.
 
-// RUN: %clang -Xclang -no-opaque-pointers -emit-llvm --cuda-device-only --offload=spirv32 \
+// RUN: %clang -emit-llvm --cuda-device-only --offload=spirv32 \
 // RUN:   -nocudalib -nocudainc %s -o %t.bc -c 2>&1
 // RUN: llvm-dis %t.bc -o %t.ll
 // RUN: FileCheck %s --input-file=%t.ll
 
-// RUN: %clang -Xclang -no-opaque-pointers -emit-llvm --cuda-device-only --offload=spirv64 \
+// RUN: %clang -emit-llvm --cuda-device-only --offload=spirv64 \
 // RUN:   -nocudalib -nocudainc %s -o %t.bc -c 2>&1
 // RUN: llvm-dis %t.bc -o %t.ll
 // RUN: FileCheck %s --input-file=%t.ll
@@ -20,6 +20,6 @@ class GpuData {
 };
 
 // CHECK: define
-// CHECK-SAME: spir_kernel void @_Z6kernel7GpuData(%class.GpuData* noundef byval(%class.GpuData) align
+// CHECK-SAME: spir_kernel void @_Z6kernel7GpuData(ptr noundef byval(%class.GpuData) align
 
 __attribute__((global)) void kernel(GpuData output) {}
diff --git a/clang/test/CodeGenCUDASPIRV/kernel-argument.cu b/clang/test/CodeGenCUDASPIRV/kernel-argument.cu
index cfc41ad7a535fa..ab885eb3d85c4a 100644
--- a/clang/test/CodeGenCUDASPIRV/kernel-argument.cu
+++ b/clang/test/CodeGenCUDASPIRV/kernel-argument.cu
@@ -1,17 +1,17 @@
 // Tests CUDA kernel arguments get global address space when targetting SPIR-V.
 
 
-// RUN: %clang -Xclang -no-opaque-pointers -emit-llvm --cuda-device-only --offload=spirv32 \
+// RUN: %clang -emit-llvm --cuda-device-only --offload=spirv32 \
 // RUN:   -nocudalib -nocudainc %s -o %t.bc -c 2>&1
 // RUN: llvm-dis %t.bc -o %t.ll
 // RUN: FileCheck %s --input-file=%t.ll
 
-// RUN: %clang -Xclang -no-opaque-pointers -emit-llvm --cuda-device-only --offload=spirv64 \
+// RUN: %clang -emit-llvm --cuda-device-only --offload=spirv64 \
 // RUN:   -nocudalib -nocudainc %s -o %t.bc -c 2>&1
 // RUN: llvm-dis %t.bc -o %t.ll
 // RUN: FileCheck %s --input-file=%t.ll
 
 // CHECK: define
-// CHECK-SAME: spir_kernel void @_Z6kernelPi(i32 addrspace(1)* noundef
+// CHECK-SAME: spir_kernel void @_Z6kernelPi(ptr addrspace(1) noundef
 
 __attribute__((global)) void kernel(int* output) { *output = 1; }