diff --git a/test/DebugInfo/LocalAddressSpace.ll b/test/DebugInfo/LocalAddressSpace.ll
index 06124ae02e..009d280c36 100644
--- a/test/DebugInfo/LocalAddressSpace.ll
+++ b/test/DebugInfo/LocalAddressSpace.ll
@@ -51,7 +51,7 @@ attributes #0 = { convergent noinline nounwind optnone "correctly-rounded-divide
 !1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 2, type: !10, isLocal: true, isDefinition: true)
 !2 = distinct !DISubprogram(name: "foo", scope: !3, file: !3, line: 1, type: !4, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !6, retainedNodes: !8)
 !3 = !DIFile(filename: "tmp/tmp.cl", directory: "/work")
-!4 = !DISubroutineType(cc: DW_CC_LLVM_OpenCLKernel, types: !5)
+!4 = !DISubroutineType(cc: DW_CC_LLVM_DeviceKernel, types: !5)
 !5 = !{null}
 !6 = distinct !DICompileUnit(language: DW_LANG_C99, file: !7, producer: "clang version 9.0.0 (https://llvm.org/git/clang 92470c6aadff9e614bfac44f48e6e1d430e5a32d) (https://llvm.org/git/llvm 461a7ee6493f997d6dc03ca0e80b6a7bd7943a83)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !8, globals: !9, nameTableKind: None)
 !7 = !DIFile(filename: "/work/tmp/<stdin>", directory: "/work/llvm/build")
diff --git a/test/DebugInfo/RecursiveDebugInfo.ll b/test/DebugInfo/RecursiveDebugInfo.ll
index 82fa84074b..0a4279425c 100644
--- a/test/DebugInfo/RecursiveDebugInfo.ll
+++ b/test/DebugInfo/RecursiveDebugInfo.ll
@@ -141,7 +141,7 @@ attributes #5 = { nounwind }
 !10 = !{}
 !11 = !{!"clang version 10.0.0"}
 !12 = distinct !DISubprogram(name: "_ZTS3foo", scope: !1, file: !1, line: 28, type: !13, flags: DIFlagArtificial | DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !14)
-!13 = !DISubroutineType(cc: DW_CC_LLVM_OpenCLKernel, types: !3)
+!13 = !DISubroutineType(cc: DW_CC_LLVM_DeviceKernel, types: !3)
 !14 = !{!15}
 !15 = !DILocalVariable(scope: !12, file: !1, type: !16)
 !16 = distinct !DICompositeType(tag: DW_TAG_class_type, file: !1, line: 28, size: 8, flags: DIFlagTypePassByValue | DIFlagNonTrivial, elements: !17)