diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2ef53a3e..e67caef3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -40,6 +40,11 @@ jobs:
             macOS: "12"
             iOS: "15.5"
             tvOS: "15.4"
+            useCodecov: "false"
+          - xcode: "14.0" # Swift 5.7
+            macOS: "12"
+            iOS: "16.0"
+            tvOS: "16.0"
             useCodecov: "true"
 
     runs-on: macos-${{ matrix.macOS }}
diff --git a/Tests/XMLCoderTests/AdvancedFeatures/ErrorContextTest.swift b/Tests/XMLCoderTests/AdvancedFeatures/ErrorContextTest.swift
index 11a9aa2f..2bf69a72 100644
--- a/Tests/XMLCoderTests/AdvancedFeatures/ErrorContextTest.swift
+++ b/Tests/XMLCoderTests/AdvancedFeatures/ErrorContextTest.swift
@@ -31,26 +31,34 @@ final class ErrorContextTest: XCTestCase {
                 return
             }
 
-            #if os(Linux) && swift(<5.4)
-            // XML Parser returns a different column on Linux
-            // https://bugs.swift.org/browse/SR-11192
-            XCTAssertEqual(ctx.debugDescription, """
+            let column2 = """
+            \(underlying.localizedDescription) \
+            at line 1, column 2:
+            `<blah `
+            """
+            let column7 = """
             \(underlying.localizedDescription) \
             at line 1, column 7:
             `ah //>`
-            """)
-            #elseif os(Windows) || os(Linux)
-            XCTAssertEqual(ctx.debugDescription, """
+            """
+            let column10 = """
             \(underlying.localizedDescription) \
             at line 1, column 10:
             `//>`
-            """)
+            """
+
+            #if os(Linux) && swift(<5.4)
+            // XML Parser returns a different column on Linux and iOS 16+
+            // https://bugs.swift.org/browse/SR-11192
+            XCTAssertEqual(ctx.debugDescription, column7)
+            #elseif os(Windows) || os(Linux)
+            XCTAssertEqual(ctx.debugDescription, column10)
             #else
-            XCTAssertEqual(ctx.debugDescription, """
-            \(underlying.localizedDescription) \
-            at line 1, column 2:
-            `<blah `
-            """)
+            if #available(iOS 16.0, tvOS 16.0, macOS 13.0, *) {
+                XCTAssertEqual(ctx.debugDescription, column7)
+            } else {
+                XCTAssertEqual(ctx.debugDescription, column2)
+            }
             #endif
         }
     }
@@ -81,22 +89,30 @@ final class ErrorContextTest: XCTestCase {
                 return
             }
 
-            #if os(Linux)
-            // XML Parser returns a different column on Linux
-            // https://bugs.swift.org/browse/SR-11192
-            XCTAssertEqual(ctx.debugDescription, """
+            let line4column1 = """
             \(underlying.localizedDescription) \
             at line 4, column 1:
             `blah>
             <c`
-            """)
-            #else
-            XCTAssertEqual(ctx.debugDescription, """
+            """
+
+            let line3column8 = """
             \(underlying.localizedDescription) \
             at line 3, column 8:
             `blah>
             <c`
-            """)
+            """
+
+            #if os(Linux)
+            // XML Parser returns a different column on Linux
+            // https://bugs.swift.org/browse/SR-11192
+            XCTAssertEqual(ctx.debugDescription, line4column1)
+            #else
+            if #available(iOS 16.0, tvOS 16.0, macOS 13.0, *) {
+                XCTAssertEqual(ctx.debugDescription, line4column1)
+            } else {
+                XCTAssertEqual(ctx.debugDescription, line3column8)
+            }
             #endif
         }
     }
diff --git a/test_xcodebuild.sh b/test_xcodebuild.sh
index af124837..92fe1533 100755
--- a/test_xcodebuild.sh
+++ b/test_xcodebuild.sh
@@ -8,10 +8,13 @@ sudo xcode-select --switch /Applications/$1.app/Contents/Developer
 xcodebuild -version
 xcodebuild test -scheme XMLCoder \
   -sdk iphonesimulator -destination "$IOS_DEVICE" | xcpretty
-xcodebuild test -scheme XMLCoder \
-  -sdk appletvsimulator -destination "$TVOS_DEVICE" | xcpretty
 
-if [ "$CODECOV_JOB" = "true"] ; then
+if $(xcodebuild -showdestinations -scheme XMLCoder | grep 'platform:tvOS.* OS:'); then
+  xcodebuild test -scheme XMLCoder \
+    -sdk appletvsimulator -destination "$TVOS_DEVICE" | xcpretty
+fi
+
+if [ "$CODECOV_JOB" = "true" ] ; then
   xcodebuild test -enableCodeCoverage YES -scheme XMLCoder \
     -sdk macosx | xcpretty
   bash <(curl -s https://codecov.io/bash)