diff --git a/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test b/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test
index 536161586ff..08ac102000c 100644
--- a/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test
+++ b/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test
@@ -34,7 +34,7 @@
 ; TYPES_1: Classes
 ; TYPES_1: struct A [sizeof = 4] {
 ; TYPES_1: virtual void PureFunc() = 0
-; TYPES_1: virtual void VirtualFunc()
+; TYPES_1: virtual void {{(A::)?}}VirtualFunc()
 ; TYPES_1: void RegularFunc()
 ; TYPES_1: }
 
diff --git a/test/tools/llvm-pdbdump/class-layout.test b/test/tools/llvm-pdbdump/class-layout.test
index 7a08194c500..1b7e909dcb7 100644
--- a/test/tools/llvm-pdbdump/class-layout.test
+++ b/test/tools/llvm-pdbdump/class-layout.test
@@ -18,7 +18,7 @@
 ; MEMBERS_TEST: class MembersTest::A [sizeof = 16] {
 ; MEMBERS_TEST-DAG: typedef int NestedTypedef
 ; MEMBERS_TEST-DAG: enum NestedEnum
-; MEMBERS_TEST: void MemberFunc()
+; MEMBERS_TEST: void {{(MembersTest::A::)?}}MemberFunc()
 ; MEMBERS_TEST-DAG: data +0x00 [sizeof=4] int IntMemberVar
 ; MEMBERS_TEST-NEXT: <padding> (4 bytes)
 ; MEMBERS_TEST-NEXT: data +0x08 [sizeof=8] double DoubleMemberVar