diff --git a/Makefile b/Makefile
index 1429e73..5483c01 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 PLATFORM_IOS = iOS Simulator,name=iPhone 11 Pro Max
 PLATFORM_MACOS = macOS
+PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
 PLATFORM_TVOS = tvOS Simulator,name=Apple TV 4K (at 1080p)
 PLATFORM_WATCHOS = watchOS Simulator,name=Apple Watch Series 4 - 44mm
 
@@ -36,6 +37,14 @@ test-platforms:
 		-configuration Release \
 		-destination platform="$(PLATFORM_MACOS)"
 
+	xcodebuild test \
+		-scheme swift-custom-dump \
+		-destination platform="$(PLATFORM_MAC_CATALYST)"
+	xcodebuild \
+		-scheme swift-custom-dump \
+		-configuration Release \
+		-destination platform="$(PLATFORM_MAC_CATALYST)"
+
 	xcodebuild test \
 		-scheme swift-custom-dump \
 		-destination platform="$(PLATFORM_TVOS)"
diff --git a/Tests/CustomDumpTests/DumpTests.swift b/Tests/CustomDumpTests/DumpTests.swift
index ad2598f..7653eaf 100644
--- a/Tests/CustomDumpTests/DumpTests.swift
+++ b/Tests/CustomDumpTests/DumpTests.swift
@@ -715,12 +715,6 @@ final class DumpTests: XCTestCase {
     )
   }
 
-  class SubclassedError: NSError {}
-
-  enum BridgedError: Error {
-    case thisIsFine(Int)
-  }
-
   func testFoundation() {
     var dump = ""
 
@@ -932,6 +926,9 @@ final class DumpTests: XCTestCase {
       """
     )
 
+    #if !os(Windows)
+    class SubclassedError: NSError {}
+
     dump = ""
     customDump(
       SubclassedError(
@@ -955,6 +952,11 @@ final class DumpTests: XCTestCase {
       )
       """
     )
+    #endif
+
+    enum BridgedError: Error {
+      case thisIsFine(Int)
+    }
 
     dump = ""
     customDump(BridgedError.thisIsFine(94) as NSError, to: &dump)
@@ -962,16 +964,20 @@ final class DumpTests: XCTestCase {
       XCTAssertNoDifference(
         dump,
         """
-        DumpTests.BridgedError.thisIsFine(94)
+        DumpTests.(unknown context).(unknown context).BridgedError.thisIsFine(94)
         """
       )
     #else
       // Can't unwrap bridged Errors on Linux: https://bugs.swift.org/browse/SR-15191
       XCTAssertNoDifference(
-        dump,
+        dump.replacingOccurrences(
+          of: #"\(unknown context at \$[[:xdigit:]]+\)"#,
+          with: "(unknown context)",
+          options: .regularExpression
+        ),
         """
         NSError(
-          domain: "CustomDumpTests.DumpTests.BridgedError",
+          domain: "CustomDumpTests.DumpTests.(unknown context).(unknown context).BridgedError",
           code: 0,
           userInfo: [:]
         )