diff --git a/llvm/unittests/DebugInfo/CMakeLists.txt b/llvm/unittests/DebugInfo/CMakeLists.txt
index e38fff58cae6..579fdb202cf4 100644
--- a/llvm/unittests/DebugInfo/CMakeLists.txt
+++ b/llvm/unittests/DebugInfo/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_subdirectory(CodeView)
 add_subdirectory(DWARF)
+add_subdirectory(MSF)
 add_subdirectory(PDB)
diff --git a/llvm/unittests/DebugInfo/MSF/CMakeLists.txt b/llvm/unittests/DebugInfo/MSF/CMakeLists.txt
new file mode 100644
index 000000000000..3f5acc2d2ff2
--- /dev/null
+++ b/llvm/unittests/DebugInfo/MSF/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(LLVM_LINK_COMPONENTS
+  DebugInfoMSF
+  )
+
+set(DebugInfoMSFSources
+  MappedBlockStreamTest.cpp
+  MSFBuilderTest.cpp
+  )
+
+add_llvm_unittest(DebugInfoMSFTests
+  ${DebugInfoMSFSources}
+  )
+
+target_link_libraries(DebugInfoMSFTests LLVMTestingSupport)
diff --git a/llvm/unittests/DebugInfo/PDB/MSFBuilderTest.cpp b/llvm/unittests/DebugInfo/MSF/MSFBuilderTest.cpp
similarity index 99%
rename from llvm/unittests/DebugInfo/PDB/MSFBuilderTest.cpp
rename to llvm/unittests/DebugInfo/MSF/MSFBuilderTest.cpp
index 23a15d14f756..4791c982fd86 100644
--- a/llvm/unittests/DebugInfo/PDB/MSFBuilderTest.cpp
+++ b/llvm/unittests/DebugInfo/MSF/MSFBuilderTest.cpp
@@ -38,7 +38,7 @@ protected:
 
   BumpPtrAllocator Allocator;
 };
-}
+} // namespace
 
 TEST_F(MSFBuilderTest, ValidateSuperBlockAccept) {
   // Test that a known good super block passes validation.
diff --git a/llvm/unittests/DebugInfo/PDB/MappedBlockStreamTest.cpp b/llvm/unittests/DebugInfo/MSF/MappedBlockStreamTest.cpp
similarity index 99%
rename from llvm/unittests/DebugInfo/PDB/MappedBlockStreamTest.cpp
rename to llvm/unittests/DebugInfo/MSF/MappedBlockStreamTest.cpp
index 59c8c4b714c1..94cd347d09a6 100644
--- a/llvm/unittests/DebugInfo/PDB/MappedBlockStreamTest.cpp
+++ b/llvm/unittests/DebugInfo/MSF/MappedBlockStreamTest.cpp
@@ -1,4 +1,4 @@
-//===- llvm/unittest/DebugInfo/PDB/MappedBlockStreamTest.cpp --------------===//
+//===- llvm/unittest/DebugInfo/MSF/MappedBlockStreamTest.cpp --------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -82,7 +82,6 @@ TEST(MappedBlockStreamTest, NumBlocks) {
                                            F.Allocator);
   EXPECT_EQ(F.block_size(), S->getBlockSize());
   EXPECT_EQ(F.layout().Blocks.size(), S->getNumBlocks());
-
 }
 
 // Tests that a read which is entirely contained within a single block works
@@ -334,7 +333,7 @@ TEST(MappedBlockStreamTest, TestWriteThenRead) {
   uint8_t byteArray1[] = {'0', '0'};
   ArrayRef<uint8_t> byteArrayRef0(byteArray0);
   ArrayRef<uint8_t> byteArrayRef1(byteArray1);
-  ArrayRef<uint8_t> byteArray[] = { byteArrayRef0, byteArrayRef1 };
+  ArrayRef<uint8_t> byteArray[] = {byteArrayRef0, byteArrayRef1};
   uint32_t intArr0[] = {890723408, 29082234};
   uint32_t intArr1[] = {890723408, 29082234};
   ArrayRef<uint32_t> intArray[] = {intArr0, intArr1};
diff --git a/llvm/unittests/DebugInfo/PDB/CMakeLists.txt b/llvm/unittests/DebugInfo/PDB/CMakeLists.txt
index 583b065f464c..e2db58ff9375 100644
--- a/llvm/unittests/DebugInfo/PDB/CMakeLists.txt
+++ b/llvm/unittests/DebugInfo/PDB/CMakeLists.txt
@@ -6,9 +6,7 @@ set(LLVM_LINK_COMPONENTS
 
 set(DebugInfoPDBSources
   HashTableTest.cpp
-  MappedBlockStreamTest.cpp
   StringTableBuilderTest.cpp
-  MSFBuilderTest.cpp
   PDBApiTest.cpp
   )