diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
index da2149a2f1f51..e8e5cf193de8c 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
@@ -996,14 +996,17 @@ SectionType ObjectFilePECOFF::GetSectionType(llvm::StringRef sect_name,
 
   SectionType section_type =
       llvm::StringSwitch<SectionType>(sect_name)
+          // PE/COFF image-file section names are limited to 8 characters,
+          // so the linker truncates the longer source names. Match both.
+          .Cases({".eh_frame", ".eh_fram"}, eSectionTypeEHFrame)
+          .Cases({".gosymtab", ".gosymta"}, eSectionTypeGoSymtab)
+          .Cases({".lldbsummaries", ".lldbsum"},
+                 lldb::eSectionTypeLLDBTypeSummaries)
+          .Cases({".lldbformatters", ".lldbfor"},
+                 lldb::eSectionTypeLLDBFormatters)
           .Case(".debug", eSectionTypeDebug)
           .Case(".stabstr", eSectionTypeDataCString)
           .Case(".reloc", eSectionTypeOther)
-          // .eh_frame can be truncated to 8 chars.
-          .Cases(".eh_frame", ".eh_fram", eSectionTypeEHFrame)
-          .Case(".gosymtab", eSectionTypeGoSymtab)
-          .Case(".lldbsummaries", lldb::eSectionTypeLLDBTypeSummaries)
-          .Case(".lldbformatters", lldb::eSectionTypeLLDBFormatters)
           .Case("swiftast", eSectionTypeSwiftModules)
           .Default(eSectionTypeInvalid);
   if (section_type != eSectionTypeInvalid)
diff --git a/lldb/test/API/functionalities/data-formatter/bytecode-summary/TestBytecodeSummary.py b/lldb/test/API/functionalities/data-formatter/bytecode-summary/TestBytecodeSummary.py
index 2b27bd3cdcda7..c32a4517b2b82 100644
--- a/lldb/test/API/functionalities/data-formatter/bytecode-summary/TestBytecodeSummary.py
+++ b/lldb/test/API/functionalities/data-formatter/bytecode-summary/TestBytecodeSummary.py
@@ -5,7 +5,6 @@
 
 
 class TestCase(TestBase):
-    @skipUnlessDarwin
     def test(self):
         self.build()
         if self.TraceOn():
diff --git a/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py b/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py
index c842b13739097..7faab87b04f30 100644
--- a/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py
+++ b/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py
@@ -5,7 +5,6 @@
 
 
 class TestCase(TestBase):
-    @skipUnlessDarwin
     def test_synthetic(self):
         self.build()
         if self.TraceOn():
@@ -22,7 +21,6 @@ def test_synthetic(self):
 
         self.expect("v acc", matching=False, substrs=["password"])
 
-    @skipUnlessDarwin
     def test_update_reuse(self):
         self.build()