diff --git a/test/DebugInfo/PDB/Inputs/empty.cpp b/test/DebugInfo/PDB/Inputs/empty.cpp
deleted file mode 100644
index f27ea18832e..00000000000
--- a/test/DebugInfo/PDB/Inputs/empty.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// Build with "cl.exe /Zi empty.cpp /link /debug /nodefaultlib /entry:main"
-
-void *__purecall = 0;
-
-int main() {
-  return 42;
-}
diff --git a/test/DebugInfo/PDB/Inputs/empty.pdb b/test/DebugInfo/PDB/Inputs/empty.pdb
deleted file mode 100644
index ae65c3a885c..00000000000
Binary files a/test/DebugInfo/PDB/Inputs/empty.pdb and /dev/null differ
diff --git a/test/DebugInfo/PDB/Inputs/symbolformat-fpo.cpp b/test/DebugInfo/PDB/Inputs/symbolformat-fpo.cpp
deleted file mode 100644
index 3a7200809d1..00000000000
--- a/test/DebugInfo/PDB/Inputs/symbolformat-fpo.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-// Compile with "cl /GR- /Zi /c /Ox /Oy symbolformat-fpo.cpp"
-// Refer to symbolformat.cpp for linking instructions.
-
-unsigned fpo_func(unsigned n) {
-  return n * 2;
-}
diff --git a/test/DebugInfo/PDB/Inputs/symbolformat.cpp b/test/DebugInfo/PDB/Inputs/symbolformat.cpp
deleted file mode 100644
index 86135a4c285..00000000000
--- a/test/DebugInfo/PDB/Inputs/symbolformat.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Compile with "cl /c /Zi /GR- symbolformat.cpp"
-// Compile symbolformat-fpo.cpp (see file for instructions)
-// Link with "link symbolformat.obj symbolformat-fpo.obj /debug /nodefaultlib
-//    /entry:main /out:symbolformat.exe"
-
-int __cdecl _purecall(void) { return 0; }
-
-struct A {
-  virtual void PureFunc() = 0 {}
-  virtual void VirtualFunc() {}
-  void RegularFunc() {}
-};
-
-struct B : public A {
-  void PureFunc() override {}
-};
-
-int main(int argc, char **argv) {
-  B b;
-  auto PureAddr = &B::PureFunc;
-  auto VirtualAddr = &A::PureFunc;
-  auto RegularAddr = &A::RegularFunc;
-  return 0;
-}
diff --git a/test/DebugInfo/PDB/Inputs/symbolformat.pdb b/test/DebugInfo/PDB/Inputs/symbolformat.pdb
deleted file mode 100644
index 3bbc7bb1389..00000000000
Binary files a/test/DebugInfo/PDB/Inputs/symbolformat.pdb and /dev/null differ
diff --git a/test/DebugInfo/PDB/lit.local.cfg b/test/DebugInfo/PDB/lit.local.cfg
deleted file mode 100644
index 28a895f5114..00000000000
--- a/test/DebugInfo/PDB/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.unsupported = not config.have_dia_sdk
diff --git a/test/DebugInfo/PDB/pdbdump-flags.test b/test/DebugInfo/PDB/pdbdump-flags.test
deleted file mode 100644
index fd14e8a2a98..00000000000
--- a/test/DebugInfo/PDB/pdbdump-flags.test
+++ /dev/null
@@ -1,14 +0,0 @@
-; RUN: llvm-pdbdump %p/Inputs/empty.pdb | FileCheck %s -check-prefix SUMMARY_CHECK
-; RUN: llvm-pdbdump -functions %p/Inputs/empty.pdb | FileCheck %s -check-prefix MAIN_CHECK
-
-; Check PDB file summary information
-; SUMMARY_CHECK: empty.pdb
-; SUMMARY_CHECK: Guid: {0B355641-86A0-A249-896F-9988FAE52FF0}
-; SUMMARY_CHECK: Attributes: HasPrivateSymbols
-
-; Check that running with only -compilands doesn't include unwanted symbol types
-; MAIN_CHECK: (EBP) int32_t __cdecl main()
-; MAIN_CHECK-NOT: vtbl:
-; MAIN_CHECK-NOT: enum:
-; MAIN_CHECK-NOT: class:
-; MAIN_CHECK-NOT: data:
diff --git a/test/DebugInfo/PDB/pdbdump-symbol-format.test b/test/DebugInfo/PDB/pdbdump-symbol-format.test
deleted file mode 100644
index 64753df16b9..00000000000
--- a/test/DebugInfo/PDB/pdbdump-symbol-format.test
+++ /dev/null
@@ -1,14 +0,0 @@
-; RUN: llvm-pdbdump -all -hidden -group-by=compiland %p/Inputs/symbolformat.pdb | FileCheck --check-prefix=FORMAT %s
-
-; The format here is func [0x<rva_start>+<prologue_length> - 0x<rva_end>-<epilogue_length>]
-; FORMAT: test\DebugInfo\PDB\Inputs\symbolformat-fpo.obj
-; FORMAT-DAG: func [0x001130+0 - 0x001137-1] (VFrame) uint32_t __cdecl fpo_func(uint32_t)
-; FORMAT: d:\src\llvm\test\DebugInfo\PDB\Inputs\symbolformat.obj
-; FORMAT-DAG: func [0x001060+3 - 0x001067-2] (EBP) int32_t __cdecl _purecall()
-; FORMAT-DAG: func [0x001070+6 - 0x001099-4] (EBP) int32_t __cdecl main(int32_t, char**)
-; FORMAT-DAG: func [0x0010b0+7 - 0x0010c7-4] (EBP) void __thiscall A::A()
-; FORMAT-DAG: func [0x0010d0+7 - 0x0010ef-4] (EBP) void __thiscall B::B()
-; FORMAT-DAG: thunk [0x000010f6 - 0x000010fa] (Pcode) B::`vcall'{0}'
-; FORMAT-DAG: func [0x001100+7 - 0x00110b-4] (EBP) virtual void __thiscall B::PureFunc()
-; FORMAT-DAG: func [0x001110+7 - 0x00111b-4] (EBP) void __thiscall A::RegularFunc()
-; FORMAT-DAG: func [0x001120+7 - 0x00112b-4] (EBP) virtual void __thiscall A::VirtualFunc()
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index f964a28551f..9336c76369a 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -31,7 +31,6 @@ config.host_ldflags = "@HOST_LDFLAGS@"
 config.llvm_use_intel_jitevents = "@LLVM_USE_INTEL_JITEVENTS@"
 config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
 config.have_zlib = "@HAVE_LIBZ@"
-config.have_dia_sdk = "@HAVE_DIA_SDK@"
 config.enable_ffi = "@LLVM_ENABLE_FFI@"
 
 # Support substitution of the tools_dir with user parameters. This is